view tests/test-extension.out @ 5149: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 93b7e2fa7ee3
children
line wrap: on
line source

uisetup called
ui.parentui isnot None
reposetup called for a
ui == repo.ui
Foo
uisetup called
ui.parentui is None
reposetup called for a
ui == repo.ui
reposetup called for b
ui == repo.ui
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
uisetup called
ui.parentui is None
Bar
% module/__init__.py-style
uisetup called
ui.parentui isnot None
reposetup called for a
ui == repo.ui
Foo
empty extension - empty cmdtable

no commands defined
debugextension extension - only debugcommands

no commands defined
debugextension extension - only debugcommands

list of commands:

 debugfoobar:
      yet another debug command

global options:
 -R --repository      repository root directory or symbolic path name
    --cwd             change working directory
 -y --noninteractive  do not prompt, assume 'yes' for any required answers
 -q --quiet           suppress output
 -v --verbose         enable additional output
    --config          set/override config option
    --debug           enable debugging output
    --debugger        start debugger
    --encoding        set the charset encoding (default: ascii)
    --encodingmode    set the charset encoding mode (default: strict)
    --lsprof          print improved command execution profile
    --traceback       print traceback on exception
    --time            time how long the command takes
    --profile         print command execution profile
    --version         output version information and exit
 -h --help            display help and exit