1 Test update logic when there are renames

     2 

     3 Update with local changes across a file rename

     4 

     5   $ hg init

     6 

     7   $ echo a > a

     8   $ hg add a

     9   $ hg ci -m a

    10 

    11   $ hg mv a b

    12   $ hg ci -m rename

    13 

    14   $ echo b > b

    15   $ hg ci -m change

    16 

    17   $ hg up -q 0

    18 

    19   $ echo c > a

    20 

    21   $ hg up

    22   merging a and b to b

    23   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

    24   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

    25   use 'hg resolve' to retry unresolved file merges

    26   [1]