tests/test-update-renames.t
author Gregory Szorc <gregory.szorc@gmail.com>
Mon, 21 Dec 2015 21:42:14 -0800
changeset 27504 ce3ae9ccd800
parent 26614 ef1eb6df7071
permissions -rw-r--r--
byterange: use absolute_import There were a lot of imports scattered around this file. They have been consolidated at the top of the file where they belong.

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]