Mercurial > hg-stable

diff tests/test-rebase-conflicts.t @ 23516:328afbad6e57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make 'saved backup' globbing less narrow in rebase tests Globbing the hash made it harder to maintain tests with run-tests -i when it was so far by the generated test output. The hashes are stable and we just need to add a (glob).
author Mads Kiilerich <madski@unity3d.com>
date Sun, 07 Dec 2014 20:04:45 +0100
parents b081decd9062
children 4f18e80d9c30
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Tue Dec 09 03:37:06 2014 +0100
+++ b/tests/test-rebase-conflicts.t	Sun Dec 07 20:04:45 2014 +0100
@@ -79,7 +79,7 @@
   $ hg resolve -m common
   (no more unresolved files)
   $ hg rebase --continue
-  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob)
 
   $ hg tglog
   @  5:secret 'L3'  mybook