--- a/tests/test-obsolete-divergent.t Mon Jun 23 13:46:42 2014 -0500
+++ b/tests/test-obsolete-divergent.t Mon Jun 23 13:50:44 2014 -0500
@@ -27,7 +27,7 @@
> hg ci -m "$1"
> }
$ getid() {
- > hg id --debug --hidden -ir "desc('$1')"
+ > hg log --hidden -r "desc('$1')" -T '{node}\n'
> }
setup repo
@@ -62,7 +62,6 @@
$ newcase direct
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (served): tip differs
$ hg log -G --hidden
o 3:392fd25390da A_2
|
@@ -104,7 +103,6 @@
$ newcase indirect_known
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (served): tip differs
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_2` `getid A_3`
@@ -143,7 +141,6 @@
$ newcase indirect_unknown
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
- invalid branchheads cache (served): tip differs
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg log -G --hidden
o 3:392fd25390da A_2
@@ -175,7 +172,6 @@
$ newcase final-unknown
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_1` `getid A_2`
- invalid branchheads cache (served): tip differs
$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
@@ -192,7 +188,6 @@
$ newcase converged_divergence
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (served): tip differs
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_1` `getid A_3`
@@ -439,7 +434,6 @@
$ newcase subset
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
- invalid branchheads cache (served): tip differs
$ hg debugsuccessorssets --hidden 'desc('A_0')'
007dc284c1f8
82623d38b9ba 392fd25390da