This is an archive of the discontinued Mercurial Phabricator instance.

merge: check for path conflicts when updating (issue5628)
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:28 AM.

Details

Summary

When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:28 AM
ryanmce accepted this revision.Sep 25 2017, 4:03 PM
ryanmce added a subscriber: ryanmce.

nice

tests/test-merge1.t
33–43

This behavior is so much better!

mbthomas updated this revision to Diff 2217.Oct 1 2017, 5:32 AM
mbthomas retitled this revision from merge: check for path conflicts when updating to merge: check for path conflicts when updating (issue5628).Oct 2 2017, 5:15 PM
mbthomas updated this revision to Diff 2358.
ryanmce accepted this revision.Oct 5 2017, 12:31 PM

Still looks good. The test looks much better now!

This revision was automatically updated to reflect the committed changes.