Mercurial > hg
diff tests/test-subrepo-git.t @ 34146:9e4f82bc2b0b
scmutil: don't append .orig to backups in origbackuppath (BC)
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.
Differential Revision: https://phab.mercurial-scm.org/D679
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 11 Sep 2017 17:49:49 +0000 |
parents | 3fee7f7d2da0 |
children | eb586ed5d8ce |
line wrap: on
line diff
--- a/tests/test-subrepo-git.t Tue Sep 12 19:27:01 2017 -0700 +++ b/tests/test-subrepo-git.t Mon Sep 11 17:49:49 2017 +0000 @@ -885,9 +885,9 @@ $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups' reverting subrepo ../gitroot creating directory: $TESTTMP/tc/.hg/origbackups (glob) - saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar.orig (glob) + saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar (glob) $ ls .hg/origbackups - foobar.orig + foobar $ rm -rf .hg/origbackups show file at specific revision