Mercurial > hg
view tests/test-update-renames.t @ 16022:04604d1a9fc3 stable
push: more precise failure check on subrepo push
This will let us distinguish between nothing to push and push failed
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 30 Jan 2012 11:26:20 -0600 |
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 ..