Mercurial > hg
view tests/test-rebase-conflicts.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 | 45495d784ad6 |
children | 4bb4895e1693 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 5: L3 | o 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Try to call --continue abort: no rebase in progress % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Try to continue without solving the conflict abort: unresolved merge conflicts (see hg resolve) % Conclude rebase saving bundle to adding branch adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files rebase completed @ 5: L3 | o 4: L2 | o 3: L1 | o 2: C3 | o 1: C2 | o 0: C1 % Check correctness - Rev. 0 c1 - Rev. 1 c1 c2 - Rev. 2 c1 c2 c3 - Rev. 3 c1 c2 c3 - Rev. 4 resolved merge - Rev. 5 resolved merge