Mercurial > hg
view tests/test-update-renames.t @ 16217:df5ecb813426
readme: mention how to run in-place
The README describes how to install Mercurial but it does not describe how to
run it in place (for developers). This adds a short paragraph to the README
describing how to do run Mercurial inplace.
author | Ross Lagerwall <rosslagerwall@gmail.com> |
---|---|
date | Fri, 02 Mar 2012 21:43:55 +0200 |
parents | 2371f4aea665 |
children | 39d38f16a3f7 |
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] $ cd ..