Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 23 Jan 2013 22:30:58 +0000
changeset 1207 c762ba67e444
parent 1205 531804688bf5 (current diff)
parent 1206 9fb4b2c19bd8 (diff)
child 1209 49ca5f6f1a95
Merge with stable
--- a/tests/test-keyword.t	Sat Jan 19 09:40:50 2013 +0000
+++ b/tests/test-keyword.t	Wed Jan 23 22:30:58 2013 +0000
@@ -751,14 +751,14 @@
 
 |Note:
 |
-| After the last rollback, the "unserved" branchheads cache became invalid, but
+| After the last rollback, the "served" branchheads cache became invalid, but
 | all changesets in the repo were public. For filtering this means:
-|   "mutable" == "unserved" == ø.
+|   "immutable" == "served" == ø.
 |
-| As the "unserved" cache is invalid, we fall back to the "mutable" cache. But
-| no update is needed between "mutable" and "unserved" and the "unserved" cache
+| As the "served" cache is invalid, we fall back to the "immutable" cache. But
+| no update is needed between "immutable" and "served" and the "served" cache
 | is not updated on disk. The on-disk version therefore stays invalid for some
-| time. This explains why the "unserved" branchheads cache is detected as
+| time. This explains why the "served" branchheads cache is detected as
 | invalid here.
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'