Mercurial > hg
view tests/test-update-renames.t @ 29381:8bfe44494a0d
templates: add support for filerevision webcommand in json style
author | Laura Médioni <laura.medioni@logilab.fr> |
---|---|
date | Fri, 03 Jun 2016 12:32:42 +0200 |
parents | ef1eb6df7071 |
children |
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 while merging b! (edit, 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]