tests/test-update-renames.t
author timeless <timeless@mozdev.org>
Thu, 31 Dec 2015 08:16:59 +0000
changeset 27637 b502138f5faa
parent 26614 ef1eb6df7071
permissions -rw-r--r--
cleanup: remove superfluous space after space after equals (python)

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 while merging b! (edit, 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]