annotate tests/test-undo.out @ 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 509e62469cb1
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
1 + mkdir t
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
2 + cd t
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 + hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 + echo a
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 + hg add a
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t test -u test -d '0 0'
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 + hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
10 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
11 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
12 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
13 + hg parents
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
15 tag: tip
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
17 date: Thu Jan 1 00:00:00 1970
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 summary: test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
19
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
20 + hg status
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
21 + hg undo
502
509e62469cb1 Update undo test
mpm@selenic.com
parents: 388
diff changeset
22 rolling back last transaction
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
23 + hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
24 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
25 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
26 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
27 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
28 0 files, 0 changesets, 0 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
29 + hg parents
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
30 + hg status
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
31 A a