-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1132a8f
commit d3f1bc5
Showing
1 changed file
with
4 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
# AccuRevMergeWrapper | ||
Wrapper around the AccuRev Merge command | ||
|
||
Sometime after AccuRev 4, the "merge -o -K" command was changed to return 1 if there were no files to merge. This causes an error when using nAnt to auto merge files. | ||
|
||
This program wraps the "merge -o -K" command, intercepts the output when there are no files to merge, and returns 0 if that is the case. This fixed the way nAnt handled the command. |