tests/test-undo.out
author mpm@selenic.com
Tue, 21 Jun 2005 19:19:39 -0800
changeset 416 5e9e8b8d2629
parent 388 398737777644
child 502 509e62469cb1
permissions -rw-r--r--
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    22
attempting to rollback last transaction
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