author | Matt Mackall <mpm@selenic.com> |
Fri, 16 Sep 2011 17:08:18 -0500 | |
changeset 15113 | b55129f7f039 |
parent 12328 | b63f6422d2a7 |
child 15501 | 2371f4aea665 |
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 [1] $ cd ..