tests/test-issue619.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Thu, 17 Sep 2015 14:03:15 -0700
changeset 26303 c99b4d6efdd8
parent 23413 0c432696dae3
child 26420 2fc86d92c4a9
permissions -rw-r--r--
merge: move default destination computation in a revset This is another step toward having "default" destination more clear and unified.

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]

Even with strange revset (issue4465)

  $ hg merge ::.
  abort: merging with a working directory ancestor has no effect
  [255]