Mercurial > hg

comparison tests/test-merge-default.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 5476a7a039c0
children 15a79ac823e8
comparison
equal deleted inserted replaced
32697:19b9fc40cc51 32698:1b5c61d38a52
31 (use 'hg update' or merge with an explicit revision) 31 (use 'hg update' or merge with an explicit revision)
32 [255] 32 [255]
33 33
34 $ hg up 34 $ hg up
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 updated to "f25cbe84d8b3: e"
36 2 other heads for branch "default" 37 2 other heads for branch "default"
37 38
38 Should fail because > 2 heads: 39 Should fail because > 2 heads:
39 40
40 $ HGMERGE=internal:other; export HGMERGE 41 $ HGMERGE=internal:other; export HGMERGE