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
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect ssl error
pushing to http://localhost:20059/
searching for changes
ssl required
% expect authorization error
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect authorization error: must have authorized user
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect success
pushing to http://localhost:20059/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rolling back last transaction
changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
% expect authorization error: all users denied
pushing to http://localhost:20059/
searching for changes
push not authorized
% expect authorization error: some users denied, users must be authenticated
pushing to http://localhost:20059/
searching for changes
push not authorized