Mercurial > hg-stable

changeset 13331:9f2c6892e004

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo-git.t: make compatible with old git
author Eric Eisner <ede@mit.edu>
date Mon, 31 Jan 2011 19:19:56 -0500
parents 4e92ad05fe18
children 60792fa3c1a8
files tests/test-subrepo-git.t
diffstat 1 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-subrepo-git.t	Tue Feb 01 01:55:45 2011 +0100
+++ b/tests/test-subrepo-git.t	Mon Jan 31 19:19:56 2011 -0500
@@ -306,19 +306,26 @@
   g
 
 Check hg update --clean
-  $ cd $TESTTMP/t
+  $ cd $TESTTMP/ta
   $ echo  > s/g
   $ cd s
   $ echo c1 > f1
   $ echo c1 > f2
   $ git add f1
-  $ git status --short
-  A  f1
-   M g
-  ?? f2
   $ cd ..
-  $ hg update -C > /dev/null 2>/dev/null
-  $ cd s
-  $ git status --short
-  ?? f1
-  ?? f2
+  $ hg status -S
+  M s/g
+  A s/f1
+  $ ls s
+  f
+  f1
+  f2
+  g
+  $ hg update --clean
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg status -S
+  $ ls s
+  f
+  f1
+  f2
+  g