tests/test-issue619.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 22 Jun 2012 12:17:49 +0200
changeset 17056 30853f4bde2f
parent 15615 41885892796e
child 23413 0c432696dae3
permissions -rw-r--r--
discovery: simplify branchmap construction against legacy server All necessary data to fire a simple revset query are already known. No call to ancestors are needed. Such ancestors calculation was already done to compute outgoing.missing.

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]