Mercurial > hg-stable

diff tests/test-rebase-collapse.t @ 12640:6cc4b14fb76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:10 -0500
parents 16b854cb80f1
children ee349e228835
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t	Fri Oct 08 22:36:10 2010 -0500
+++ b/tests/test-rebase-collapse.t	Fri Oct 08 22:36:10 2010 -0500
@@ -77,7 +77,7 @@
   $ cd a1
 
   $ hg rebase --collapse --keepbranches
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  5: 'Collapsed revision
@@ -111,7 +111,7 @@
   $ cd a2
 
   $ hg rebase --base 6 --collapse
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  6: 'Collapsed revision
@@ -220,7 +220,7 @@
 Rebase and collapse - E onto H:
 
   $ hg rebase -s 4 --collapse
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @    5: 'Collapsed revision
@@ -331,7 +331,7 @@
 
   $ hg rebase -s 4 --collapse
   merging E
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @    5: 'Collapsed revision
@@ -420,7 +420,7 @@
   $ cd d1
 
   $ hg rebase -s 1 --collapse
-  saved backup bundle to */.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
   @  2: 'Collapsed revision