--- a/tests/test-obsolete-rebase.t Wed Sep 19 17:30:07 2012 +0200
+++ b/tests/test-obsolete-rebase.t Wed Sep 19 15:28:35 2012 +0200
@@ -286,26 +286,25 @@
$ hg ci -m 'babar is not dead'
$ echo '[ui]' >> .hg/hgrc
$ echo 'logtemplate={rev} {node|short} {desc|firstline}\n' >> .hg/hgrc
- $ hg pull --rebase --traceback
+ $ hg pull --rebase --traceback | grep -v 'saved'
pulling from $TESTTMP/repo
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+4 heads)
- saved backup bundle to $TESTTMP/other/.hg/strip-backup/2a6c62a1b55d-backup.hg
$ hg glog
- @ 7 d5567dbec794 babar is not dead
+ @ [78] d5567dbec794 babar is not dead (re)
|
- o 6 1951ead97108 appendab
+ o [67] 1951ead97108 appendab (re)
|
- o 5 03f165c84ea8 addd
+ o [56] 03f165c84ea8 addd (re)
|
- | o 4 a7773ffa7edc Collapsed revision
+ | o [45] a7773ffa7edc Collapsed revision (re)
|/
- | o 3 9c5494949763 adde
+ | o [34] 9c5494949763 adde (re)
|/
- | o 2 102a90ea7b4a addb
+ | o [23] 102a90ea7b4a addb (re)
| |
o | 1 540395c44225 changea
|/