Mercurial > hg
view tests/test-update-renames.t @ 14200:dc733eec9169
test-treediscovery: fix escaping for both dash and bash
A '\n' on the command line is turned into a newline by dash, but kept
as-is by bash, which resulted in a syntax error in the config file.
Luckily, dash wont turn '\n' into a newline when it is part of a
here-doc, so we can write the config file using that technique.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 05 May 2011 19:29:02 +0200 |
parents | b63f6422d2a7 |
children | 2371f4aea665 |
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 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] $ cd ..