Mercurial > hg

diff tests/test-merge-types.t @ 32698:1b5c61d38a52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: show the commit to which we updated in case of multiple heads (BC) Currently when we have multiple heads on the same branch, update tells us that there some more heads for the current branch but does not tells us the head to which the repository has been updated to. It makes more sense showing the head we updated to and then telling there are some more heads.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 06 Jun 2017 22:17:39 +0530
parents 7d4ce4b567c5
children 41ef02ba329b
line wrap: on
line diff
--- a/tests/test-merge-types.t	Fri May 19 20:29:11 2017 -0700
+++ b/tests/test-merge-types.t	Tue Jun 06 22:17:39 2017 +0530
@@ -155,6 +155,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  updated to "521a1e40188f: symlink"
   1 other heads for branch "default"
   $ hg st
   ? a.orig
@@ -176,6 +177,7 @@
   keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
+  updated to "521a1e40188f: symlink"
   1 other heads for branch "default"
   [1]
   $ hg diff --git