Mercurial > hg
diff tests/test-merge10 @ 8168:8766fee6f225
tests: removed redundant "-u test" from test scripts
The tests are executed with a .hgrc file which adds "-u test" by
default.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 14:49:49 +0200 |
parents | 59b8f9361545 |
children |
line wrap: on
line diff
--- a/tests/test-merge10 Sun Apr 26 14:29:02 2009 +0200 +++ b/tests/test-merge10 Sun Apr 26 14:49:49 2009 +0200 @@ -9,23 +9,23 @@ mkdir -p testdir echo a > testdir/a hg add testdir/a -hg commit -u test -d '1000000 0' -m a +hg commit -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 +hg commit -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 +hg commit -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 commit -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge