##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r12195:ee41be2b default
r12278:c4c2ba55 merge default
Show More
test-issue619.t
30 lines | 569 B | text/troff | Tads3Lexer
Adrian Buehlmann
tests: unify test-issue*
r12195 # http://mercurial.selenic.com/bts/issue619
$ hg init
$ echo a > a
$ hg ci -Ama
adding a
$ echo b > b
$ hg branch b
marked working directory as branch b
$ hg ci -Amb
adding b
$ hg co -C 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Fast-forward:
$ hg merge b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -Ammerge
Bogus fast-forward should fail:
$ hg merge b
abort: merging with a working directory ancestor has no effect
$ true