Mercurial > hg
annotate tests/test-notfound @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | 891b6a262c4b |
children |
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 |