merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
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