Mercurial > hg
view tests/test-update-renames.t @ 24327:f7c0556d22d7
test-convert-git: show insane progress bar with octopus merge (issue4169)
This is done as a separate change from the fix so that it's obvious
what is corrected by the bugfix.
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 12 Mar 2015 21:31:52 -0400 |
parents | 39d38f16a3f7 |
children | ef1eb6df7071 |
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 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]