Mercurial > hg
diff tests/test-conflict.t @ 32698:1b5c61d38a52
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 | 458f7294dfee |
| children | 8e6f4939a69a |
line wrap: on
line diff
--- a/tests/test-conflict.t Fri May 19 20:29:11 2017 -0700 +++ b/tests/test-conflict.t Tue Jun 06 22:17:39 2017 +0530 @@ -220,6 +220,7 @@ $ hg up -C 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "e0693e20f496: 123456789012345678901234567890123456789012345678901234567890????" 1 other heads for branch "default" $ printf "\n\nEnd of file\n" >> a $ hg ci -m "Add some stuff at the end" @@ -258,6 +259,7 @@ $ hg up -C 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + updated to "18b51d585961: Add some stuff at the beginning" 1 other heads for branch "default" $ hg merge --tool :merge-local merging a