##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert: fix syncing deletes from p2 merge commit...
convert: fix syncing deletes from p2 merge commit Recently we fixed converting merges to correctly sync changes from p2. We missed the case of deletes though (so p2 deleted a file that p1 had not yet deleted, and the file does not belong to the source). The fix is to detect when p2 doesn't have the file, so we just sync it as a delete to p1 in the merge. Updated the test, and verified it failed before the fix.
Durham Goode -
r26078:5ca58734 default
Show More
Name Size Modified Last Commit Author
/ hgext / largefiles
CONTRIBUTORS Loading ...
__init__.py Loading ...
basestore.py Loading ...
lfcommands.py Loading ...
lfutil.py Loading ...
localstore.py Loading ...
overrides.py Loading ...
proto.py Loading ...
remotestore.py Loading ...
reposetup.py Loading ...
uisetup.py Loading ...
wirestore.py Loading ...