tests/test-pull-branch.t
changeset 14485 610873cf064a
parent 13804 7dc2bd4c0dc8
child 15615 41885892796e
--- a/tests/test-pull-branch.t	Tue May 31 15:55:23 2011 -0500
+++ b/tests/test-pull-branch.t	Tue May 31 11:52:22 2011 -0700
@@ -131,11 +131,12 @@
   adding manifests
   adding file changes
   added 4 changesets with 4 changes to 1 files (+1 heads)
-  not updating, since new heads added
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Make changes on new branch on tt
 
+  $ hg up 6
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch branchC
   marked working directory as branch branchC
   $ echo b1 > bar