Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-extension.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 27 Oct 2007 16:27:55 +0400 |
| 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