tests/test-update-renames.t
author Gregory Szorc <gregory.szorc@gmail.com>
Sun, 20 Apr 2014 10:06:19 -0700
changeset 21375 bd70dcb91af6
parent 16911 39d38f16a3f7
child 26614 ef1eb6df7071
permissions -rw-r--r--
run-tests: move umask into TestRunner.run() We now properly restore the umask as well, since run() tries to clean up after itself.

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]