tests/test-issue619.t
author Christian Ebert <blacktrash@gmx.net>
Tue, 14 Sep 2010 22:11:46 +0200
changeset 12281 d9cf0d1d0d0f
parent 12195 ee41be2bbf5a
child 12316 4134686b83e1
permissions -rw-r--r--
mq: consistently use opts.get() to prevent potential KeyError

# 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
  $ 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

  $ true