tests/test-update-renames.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 21 Nov 2012 00:53:45 +0100
changeset 18002 9bc5873e52af
parent 16911 39d38f16a3f7
child 26614 ef1eb6df7071
permissions -rw-r--r--
clfilter: phases logic should be unfiltered Phase computations and boundary movements need to be aware of all revisions that exist in the repository to return correct results.

Test update logic when there are renames

Update with local changes across a file rename

  $ hg init

  $ echo a > a
  $ hg add a
  $ hg ci -m a

  $ hg mv a b
  $ hg ci -m rename

  $ echo b > b
  $ hg ci -m change

  $ hg up -q 0

  $ echo c > a

  $ hg up
  merging a and b to b
  warning: conflicts during merge.
  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges
  [1]