Mercurial > hg
diff tests/test-rename-dir-merge @ 8167:6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 14:29:02 +0200 |
parents | 56e9f7b2d8fa |
children |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-rename-dir-merge Sun Apr 26 14:29:02 2009 +0200 @@ -7,27 +7,27 @@ mkdir a echo foo > a/a echo bar > a/b -hg ci -Am "0" -d "0 0" +hg ci -Am "0" hg co -C 0 hg mv a b -hg ci -m "1 mv a/ b/" -d "0 0" +hg ci -m "1 mv a/ b/" hg co -C 0 echo baz > a/c echo quux > a/d hg add a/c -hg ci -m "2 add a/c" -d "0 0" +hg ci -m "2 add a/c" hg merge --debug 1 echo a/* b/* hg st -C -hg ci -m "3 merge 2+1" -d "0 0" +hg ci -m "3 merge 2+1" hg debugrename b/c hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C -hg ci -m "4 merge 1+2" -d "0 0" +hg ci -m "4 merge 1+2" hg debugrename b/c