test-issue619.t
36 lines
| 758 B
| text/troff
|
Tads3Lexer
/ tests / test-issue619.t
Matt Mackall
|
r12328 | http://mercurial.selenic.com/bts/issue619 | ||
Adrian Buehlmann
|
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
|
r15615 | (branches are permanent and global, did you want a bookmark?) | ||
|
Adrian Buehlmann
|
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
|
r12316 | [255] | ||
|
Adrian Buehlmann
|
r12195 | |||
Pierre-Yves David
|
r23413 | Even with strange revset (issue4465) | ||
| $ hg merge ::. | ||||
| abort: merging with a working directory ancestor has no effect | ||||
| [255] | ||||