Mercurial > hg
view tests/test-extension.out @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | 0750f11152fe |
children | a78d8edaeedd |
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 updating working directory 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