--- a/mercurial/repoview.py	Mon Jan 21 13:42:04 2013 -0200
+++ b/mercurial/repoview.py	Mon Jan 21 19:40:15 2013 +0100
@@ -72,7 +72,7 @@
 def computeimpactable(repo):
     """Everything impactable by mutable revision
 
-    The mutable filter still have some chance to get invalidated. This will
+    The immutable filter still have some chance to get invalidated. This will
     happen when:
 
     - you garbage collect hidden changeset,

--- a/tests/test-keyword.t	Mon Jan 21 13:42:04 2013 -0200
+++ b/tests/test-keyword.t	Mon Jan 21 19:40:15 2013 +0100
@@ -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>'

--- a/tests/test-phases.t	Mon Jan 21 13:42:04 2013 -0200
+++ b/tests/test-phases.t	Mon Jan 21 19:40:15 2013 +0100
@@ -173,7 +173,7 @@
 
 :note: The "(+1 heads)" is wrong as we do not had any visible head
 
-check that branch cache with "unserved" filter are properly computed and stored
+check that branch cache with "served" filter are properly computed and stored
 
   $ ls ../push-dest/.hg/cache/branchheads*
   ../push-dest/.hg/cache/branchheads-served