Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-notfound @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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 |