This is an archive of the discontinued Mercurial Phabricator instance.

merge: improve error messages for path conflicts during update
ClosedPublic

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

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

nice improvement

mercurial/merge.py
744–752

Consider saving a line with warn = repo.ui.warn

mbthomas updated this revision to Diff 2218.Oct 1 2017, 5:33 AM
mbthomas marked an inline comment as done.Oct 1 2017, 6:43 AM
mbthomas updated this revision to Diff 2359.Oct 2 2017, 5:15 PM
ryanmce accepted this revision.Oct 5 2017, 12:32 PM

still looks good after updates

This revision was automatically updated to reflect the committed changes.