Mercurial > hg

diff tests/test-subrepo-git.t @ 23678:194d2f185008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add full revert support for git subrepos Previously, revert was only possible if the '--no-backup' switch was specified. Now, to support backups, we explicitly go over all modified files in the subrepo.
author Mathias De Maré <mathias.demare@gmail.com>
date Sun, 28 Dec 2014 10:42:25 +0100
parents 7651621507cf
children 9a02f7517939
line wrap: on
line diff
--- a/tests/test-subrepo-git.t	Tue Dec 23 19:54:48 2014 -0800
+++ b/tests/test-subrepo-git.t	Sun Dec 28 10:42:25 2014 +0100
@@ -787,14 +787,13 @@
 revert the subrepository
   $ hg revert --all
   reverting subrepo ../gitroot (glob)
-  ../gitroot: reverting git subrepos without --no-backup is unsupported (glob)
 
   $ hg status --subrepos
-  M s/foobar
-  A s/barfoo
+  ? s/barfoo
+  ? s/foobar.orig
 
-  $ hg revert --no-backup --all
-  reverting subrepo ../gitroot (glob)
+  $ mv s/foobar.orig s/foobar
+
   $ hg revert --no-backup s
   reverting subrepo ../gitroot (glob)