Mercurial > public > mercurial-scm > hg

diff tests/test-largefiles-update.t @ 28030:ca2a0a654f54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: warn about other topological head in pull and unbundle Other commands have a '--update' triggering a bare update. We now issue the message introduced into the previous changeset for these too.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 03 Feb 2016 15:12:01 +0000
parents 72072cfc7e91
children 0707bbec682d
line wrap: on
line diff
--- a/tests/test-largefiles-update.t	Tue Feb 02 14:49:02 2016 +0000
+++ b/tests/test-largefiles-update.t	Wed Feb 03 15:12:01 2016 +0000
@@ -465,6 +465,7 @@
   keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
   take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
   2 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
 
   $ hg status -A large1
   M large1
@@ -498,6 +499,7 @@
   keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
   take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
   2 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  1 other heads for branch "default"
 
   $ hg status -A large1
   M large1