Mercurial > hg
view tests/test-update-renames.t @ 12978:5ac9c903e7d2
test-win32text: use $TESTTMP in output
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 13 Nov 2010 15:20:37 +0100 |
parents | b63f6422d2a7 |
children | 2371f4aea665 |
line wrap: on
line source
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 ..