--- a/tests/test-obsolete-divergent.t Tue Jan 15 20:55:47 2013 +0100
+++ b/tests/test-obsolete-divergent.t Sun Jan 13 01:39:16 2013 -0600
@@ -62,7 +62,7 @@
$ newcase direct
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (unserved): tip differs
+ invalid branchheads cache (served): tip differs
$ hg log -G --hidden
o 3:392fd25390da A_2
|
@@ -104,7 +104,7 @@
$ newcase indirect_known
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (unserved): tip differs
+ invalid branchheads cache (served): tip differs
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_2` `getid A_3`
@@ -143,7 +143,7 @@
$ newcase indirect_unknown
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
- invalid branchheads cache (unserved): tip differs
+ 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 +175,7 @@
$ newcase final-unknown
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_1` `getid A_2`
- invalid branchheads cache (unserved): tip differs
+ invalid branchheads cache (served): tip differs
$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
@@ -192,7 +192,7 @@
$ newcase converged_divergence
$ hg debugobsolete `getid A_0` `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
- invalid branchheads cache (unserved): tip differs
+ invalid branchheads cache (served): tip differs
$ mkcommit A_3
created new head
$ hg debugobsolete `getid A_1` `getid A_3`
@@ -439,7 +439,7 @@
$ newcase subset
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
- invalid branchheads cache (unserved): tip differs
+ invalid branchheads cache (served): tip differs
$ hg debugsuccessorssets --hidden 'desc('A_0')'
007dc284c1f8
82623d38b9ba 392fd25390da