diff options
Diffstat (limited to 'tests/test-issue619.t')
-rw-r--r-- | tests/test-issue619.t | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/test-issue619.t b/tests/test-issue619.t new file mode 100644 index 0000000..e53e4df --- /dev/null +++ b/tests/test-issue619.t @@ -0,0 +1,30 @@ +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 + (branches are permanent and global, did you want a bookmark?) + $ 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 + [255] + |