comparison tests/test-rawcommit1.out @ 547:4fc63e22b1fe

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents e94cebc60d96 c8ae964109c1
children eb46971fc57f
comparison
equal deleted inserted replaced
540:53872e2be33a 547:4fc63e22b1fe
26 date: Thu Jan 1 00:00:00 1970 26 date: Thu Jan 1 00:00:00 1970
27 files+: c 27 files+: c
28 description: 28 description:
29 2 29 2
30 30
31
31 + rm b 32 + rm b
32 + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b 33 + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
33 + hg -d manifest 3 34 + hg -d manifest 3
34 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 35 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
35 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 36 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
42 user: user 43 user: user
43 date: Thu Jan 1 00:00:00 1970 44 date: Thu Jan 1 00:00:00 1970
44 files-: b 45 files-: b
45 description: 46 description:
46 3 47 3
48
47 49
48 + echo this is a22 50 + echo this is a22
49 + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a 51 + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
50 + hg -d manifest 4 52 + hg -d manifest 4
51 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 53 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
60 date: Thu Jan 1 00:00:00 1970 62 date: Thu Jan 1 00:00:00 1970
61 files: a 63 files: a
62 description: 64 description:
63 4 65 4
64 66
67
65 + echo this is c22 68 + echo this is c22
66 + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c 69 + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
67 + hg -d manifest 5 70 + hg -d manifest 5
68 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 71 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
69 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b 72 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
77 date: Thu Jan 1 00:00:00 1970 80 date: Thu Jan 1 00:00:00 1970
78 files: a 81 files: a
79 description: 82 description:
80 4 83 4
81 84
85
82 + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6 86 + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
83 + hg -d manifest 6 87 + hg -d manifest 6
84 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 88 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
85 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 89 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
86 + hg -d parents 90 + hg -d parents
91 manifest: 6:71c4262e09a89666ee12a92fefa12085aad53243 95 manifest: 6:71c4262e09a89666ee12a92fefa12085aad53243
92 user: user 96 user: user
93 date: Thu Jan 1 00:00:00 1970 97 date: Thu Jan 1 00:00:00 1970
94 description: 98 description:
95 6 99 6
100
96 101
97 + hg -d rawcommit -p 6 -d '0 0' -u user -t7 102 + hg -d rawcommit -p 6 -d '0 0' -u user -t7
98 + hg -d manifest 7 103 + hg -d manifest 7
99 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 104 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
100 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 105 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
107 user: user 112 user: user
108 date: Thu Jan 1 00:00:00 1970 113 date: Thu Jan 1 00:00:00 1970
109 description: 114 description:
110 7 115 7
111 116
117