Mercurial > hg
changeset 11346:e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Mon, 14 Jun 2010 13:39:00 -0400 |
| parents | 4b81f82b03e3 |
| children | 18680b0e20a7 |
| files | tests/test-merge3 tests/test-merge3.out tests/test-remove-new tests/test-remove-new.out |
| diffstat | 4 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge3 Tue Jun 15 10:01:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -hg init -echo This is file a1 > a -hg add a -hg commit -m "commit #0" -d "1000000 0" -touch b -hg add b -rm b -hg commit -A -m"comment #1" -d "1000000 0" -exit 0
--- a/tests/test-merge3.out Tue Jun 15 10:01:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -removing b -nothing changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-remove-new Mon Jun 14 13:39:00 2010 -0400 @@ -0,0 +1,14 @@ +#!/bin/sh + +# test that 'hg commit' does not crash if the user removes a +# newly added file + +hg init +echo This is file a1 > a +hg add a +hg commit -m "commit #0" -d "1000000 0" +touch b +hg add b +rm b +hg commit -A -m"comment #1" -d "1000000 0" +exit 0