Mercurial > public > mercurial-scm > hg-stable

diff tests/test-subrepo-git.t @ 26940:91786f20db83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git-subrepos: revert respects specified location to save .orig files This patch makes revert in git subrepos save .orig files where the user wants them by using the cmdutil.origpath function.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 14:29:13 -0800
parents fc92ccbbeb9a
children b54b520a24c2
line wrap: on
line diff
--- a/tests/test-subrepo-git.t	Tue Nov 10 14:26:19 2015 -0800
+++ b/tests/test-subrepo-git.t	Tue Nov 10 14:29:13 2015 -0800
@@ -875,6 +875,16 @@
   $ hg status --subrepos
   ? s/barfoo
 
+revert moves orig files to the right place
+  $ echo 'bloop' > s/foobar
+  $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
+  reverting subrepo ../gitroot
+  creating directory: $TESTTMP/tc/.hg/origbackups
+  saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar.orig
+  $ ls .hg/origbackups
+  foobar.orig
+  $ rm -rf .hg/origbackups
+
 show file at specific revision
   $ cat > s/foobar << EOF
   > woop    woop