author | Adrian Buehlmann <adrian@cadifra.com> |
Tue, 14 Sep 2010 15:37:10 +0200 | |
changeset 12299 | a73684df0f8a |
parent 10874 | tests/test-update-renames@4f11978ae45d |
child 12316 | 4134686b83e1 |
permissions | -rw-r--r-- |
# 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 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges $ cd ..