2015-09-30 23:31:07 +03:00
|
|
|
https://bz.mercurial-scm.org/619
|
2010-09-04 01:34:37 +04:00
|
|
|
|
|
|
|
$ hg init
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -Ama
|
|
|
|
adding a
|
|
|
|
|
|
|
|
$ echo b > b
|
|
|
|
$ hg branch b
|
|
|
|
marked working directory as branch b
|
2011-12-09 00:32:44 +04:00
|
|
|
(branches are permanent and global, did you want a bookmark?)
|
2010-09-04 01:34:37 +04:00
|
|
|
$ 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
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-04 01:34:37 +04:00
|
|
|
|
2014-12-01 16:18:12 +03:00
|
|
|
Even with strange revset (issue4465)
|
|
|
|
|
|
|
|
$ hg merge ::.
|
|
|
|
abort: merging with a working directory ancestor has no effect
|
|
|
|
[255]
|
|
|
|
|