Mercurial > hg
view tests/test-merge10 @ 7012:78341ea65d16
restructure helptable
When looking up a help topic, the key is now only matched against the
short names for each topic, and not the header. So
hg help 'Environment Variables'
must be replaced with
hg help env
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Tue, 09 Sep 2008 21:32:39 +0200 |
parents | 59b8f9361545 |
children | 8766fee6f225 |
line wrap: on
line source
#!/bin/sh # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb # (merge correctly when all the files in a directory are moved # but then local changes are added in the same directory) hg init a cd a mkdir -p testdir echo a > testdir/a hg add testdir/a hg commit -u test -d '1000000 0' -m a cd .. hg clone a b cd a echo alpha > testdir/a hg commit -u test -d '1000000 0' -m remote-change cd .. cd b mkdir testdir/subdir hg mv testdir/a testdir/subdir/a hg commit -u test -d '1000000 0' -m move mkdir newdir echo beta > newdir/beta hg add newdir/beta hg commit -u test -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge hg stat hg diff --nodates