tests/test-update-renames.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Tue, 06 Oct 2015 02:08:32 -0700
changeset 26553 89b806a09a66
parent 16911 39d38f16a3f7
child 26614 ef1eb6df7071
permissions -rw-r--r--
extract: move 'date' assignment where it is parsed There is one setter and no consumer, we can move it there directly.

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]