author | Bryan O'Sullivan <bryano@fb.com> |
Fri, 15 Jan 2016 13:14:49 -0800 | |
changeset 27850 | 49cfddbf54ba |
parent 26614 | ef1eb6df7071 |
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 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]