##// END OF EJS Templates
journal: report parsing errors on recover/rollback (issue4172)
journal: report parsing errors on recover/rollback (issue4172)

File last commit:

r15615:41885892 stable
r20524:28b8ff84 default
Show More
test-issue619.t
30 lines | 629 B | text/troff | Tads3Lexer
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 http://mercurial.selenic.com/bts/issue619
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg init
$ echo a > a
$ hg ci -Ama
adding a
$ echo b > b
$ hg branch b
marked working directory as branch b
Matt Mackall
branch: warn on branching
r15615 (branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann
tests: unify test-issue*
r12195 $ 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
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-issue*
r12195