annotate tests/test-undo @ 576:da11baf5de7b

Handle unknown files better on update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle unknown files better on update If we spot an unknown file that's identical to one that's in the update, we get the updated one so that it shows up in the dirstate properly. manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ VgKqZS54hTAWN3jL2yllUhI= =iPQD -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 15:21:22 -0800
parents 4fc63e22b1fe
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 350
diff changeset
1 #!/bin/sh
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 set -x
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 mkdir t
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 cd t
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 echo a > a
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 hg add a
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 hg commit -t "test" -u test -d "0 0"
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
10 hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 hg parents
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12 hg status
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13 hg undo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 hg parents
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 hg status