tests/test-update-renames.t
author David Champion <dgc@uchicago.edu>
Tue, 29 May 2012 07:07:10 -0500
branchstable
changeset 16950 0fdd8193c8b5
parent 15501 2371f4aea665
child 16911 39d38f16a3f7
permissions -rw-r--r--
notify: various fixes to docstring Typo corrections, grammar adjustments, clarity improvements.

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]

  $ cd ..