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.

Added test for commands.dispatch (especially 88803a69b24)

test-context.py: Don't create second repo instance (fixed since 7b5723c95a82)

fancyopts: Copy list arguments in command table before modifying. Before this, executing commands.dispatch(['log', '-r', '0']) commands.dispatch(['log', '-r', 'tip']) would look like: hg log -r 0 hg log -r 0 -r tip Reported by TK Soh, patch by Alexis S. L. Carvalho

Print less scary message if the system supports symlinks: "Skipping test-no-symlinks: system supports symbolic links" instead of "Skipping test-no-symlinks: unexpected feature: symbolic links"

Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

hghave: prefix temporary files with "hg-hghave-"

test-no-symlinks: rename .bundle into .hg for consistency.

fix up previous commit for stable

Cache extension load failures. hg commands call extensions.loadall twice, once during dispatch and once when the repository is instantiated. Without this change, load caches successful loads, but not unsuccessful, causing errors to be displayed twice.