Mercurial > hg
view tests/test-debugcomplete.out @ 5096:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 12 Aug 2007 12:15:10 -0300 |
parents | 3ba82c3f4bc3 |
children | 01ba62729c60 |
line wrap: on
line source
% Show all commands except debug commands add addremove annotate archive backout branch branches bundle cat clone commit copy diff export grep heads help identify import incoming init locate log manifest merge outgoing parents paths pull push recover remove rename revert rollback root serve showconfig status tag tags tip unbundle update verify version % Show all commands that start with "a" add addremove annotate archive % Do not show debug commands if there are other candidates diff % Show debug commands if there are no other candidates debugancestor debugcheckstate debugcomplete debugconfig debugdata debugdate debugindex debugindexdot debuginstall debugrawcommit debugrebuildstate debugrename debugsetparents debugstate debugwalk % Do not show the alias of a debug command if there are other candidates % (this should hide rawcommit) recover remove rename revert rollback root % Show the alias of a debug command if there are no other candidates rawcommit % Show the global options --config --cwd --debug --debugger --encoding --encodingmode --help --lsprof --noninteractive --profile --quiet --repository --time --traceback --verbose --version -R -h -q -v -y % Show the options for the "serve" command --accesslog --address --config --cwd --daemon --daemon-pipefds --debug --debugger --encoding --encodingmode --errorlog --help --ipv6 --lsprof --name --noninteractive --pid-file --port --profile --quiet --repository --stdio --style --templates --time --traceback --verbose --version --webdir-conf -6 -A -E -R -a -d -h -n -p -q -t -v -y % Show an error if we use --options with an ambiguous abbreviation hg: command 's' is ambiguous: serve showconfig status