Mercurial > hg

diff tests/test-pull-branch.t @ 14485:610873cf064a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make pull -u behave like pull && update Previously, pull would not update if new branch heads were received, whereas pull && update would move to the tipmost branch head. Also change the "crosses branches" abort in merge.update from "crosses branches (merge branches or use --check to force update)" to "crosses branches (merge branches or update --check to force update)" since it can no longer assume the user is running hg update.
author Brendan Cully <brendan@kublai.com>
date Tue, 31 May 2011 11:52:22 -0700
parents 7dc2bd4c0dc8
children 41885892796e
line wrap: on
line diff
--- 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