Mercurial > hg
view tests/test-rebase-check-restore.out @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
parents | b214066b7e1d |
children | 4bb4895e1693 |
line wrap: on
line source
% - Rebasing B onto E - check keep @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on rebase completed @ 7:C: | o 6:B: | | o 5:F:notdefault | | o | 4:E: | | o | 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: % - Rebase F onto E - check keepbranches @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rebase completed @ 5:F:notdefault | o 4:E: | o 3:D: | | o 2:C: | | | o 1:B: |/ o 0:A: