This is an archive of the discontinued Mercurial Phabricator instance.

scmutil: don't append .orig to backups in origbackuppath
ClosedPublic

Authored by mbthomas on Sep 11 2017, 1:58 PM.

Details

Summary

When ui.origbackuppath is set, .orig files are stored outside of the working
copy, however they still have a .orig suffix appended to them. This can cause
unexpected conflicts, particularly when tracked files or directories have .orig
at the end.

This change removes the .orig suffix from files stored in an out-of-tree
origbackuppath.

Test Plan

Update and run unit tests.

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 11 2017, 1:58 PM
ryanmce accepted this revision.Sep 11 2017, 3:05 PM
durham accepted this revision.Sep 12 2017, 11:50 AM
yuja accepted this revision.Sep 13 2017, 10:42 AM
yuja added a subscriber: yuja.

Marked as (BC) and queued, thanks.

This revision is now accepted and ready to land.Sep 13 2017, 10:42 AM
This revision was automatically updated to reflect the committed changes.