tests/test-update-renames.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 28 Jul 2012 13:33:06 +0200
branchstable
changeset 17298 59c14bf5a48c
parent 16911 39d38f16a3f7
child 26614 ef1eb6df7071
permissions -rw-r--r--
pushkey: do not exchange obsole markers if feature is disabled This apply to both push and pull both when client or server.

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]