comparison tests/test-remove-new @ 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 tests/test-merge3@6a64813276ed
children
comparison
equal deleted inserted replaced
11345:4b81f82b03e3 11346:e740f36cfb4b
1 #!/bin/sh
2
3 # test that 'hg commit' does not crash if the user removes a
4 # newly added file
5
6 hg init
7 echo This is file a1 > a
8 hg add a
9 hg commit -m "commit #0" -d "1000000 0"
10 touch b
11 hg add b
12 rm b
13 hg commit -A -m"comment #1" -d "1000000 0"
14 exit 0