##// END OF EJS Templates
update: show the commit to which we updated in case of multiple heads (BC)...
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.

File last commit:

r26420:2fc86d92 default
r32698:1b5c61d3 default
Show More
test-issue612.t
34 lines | 624 B | text/troff | Tads3Lexer
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/612
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg init
$ mkdir src
$ echo a > src/a.c
$ hg ci -Ama
adding src/a.c
$ hg mv src source
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 moving src/a.c to source/a.c (glob)
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg ci -Ammove
$ hg co -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo new > src/a.c
$ echo compiled > src/a.o
$ hg ci -mupdate
created new head
$ hg status
? src/a.o
$ hg merge
merging src/a.c and source/a.c to source/a.c
Matt Mackall
merge: don't use unknown()...
r16094 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
tests: unify test-issue*
r12195 (branch merge, don't forget to commit)
$ hg status
M source/a.c
R src/a.c
Matt Mackall
merge: don't use unknown()...
r16094 ? src/a.o
Adrian Buehlmann
tests: unify test-issue*
r12195