annotate tests/test-notfound @ 1798:d610fe0e6893

hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 891b6a262c4b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
909
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
1 #!/bin/sh
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
2
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 hg init
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 echo "Is there an error message when trying to diff non-existing files?"
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 hg diff not found
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 echo "Is there an error message when trying to add non-existing files?"
e2e7a2462ede Addes test for error messages when operating on non-existing files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
9 hg add not found