Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rawcommit1.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 853bfbf1a312 |
children | 1f9ec150a476 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
13 + hg manifest 2 | 13 + hg manifest 2 |
14 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | 14 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
15 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | 15 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
16 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | 16 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
17 + hg parents | 17 + hg parents |
18 changeset: 2:9f827976dae422d883af3cedc7a849c3e41a9b96 | 18 changeset: 2:9f827976dae4 |
19 tag: tip | 19 tag: tip |
20 user: test | 20 user: test |
21 date: Thu Jan 1 00:00:00 1970 | 21 date: Thu Jan 1 00:00:00 1970 |
22 summary: 2 | 22 summary: 2 |
23 | 23 |
25 + hg rawcommit -p 2 -d '0 0' -m3 b | 25 + hg rawcommit -p 2 -d '0 0' -m3 b |
26 + hg manifest 3 | 26 + hg manifest 3 |
27 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | 27 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
28 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | 28 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
29 + hg parents | 29 + hg parents |
30 changeset: 3:c8225a10618652ed2048e5ec0e917a92e50b9032 | 30 changeset: 3:c8225a106186 |
31 tag: tip | 31 tag: tip |
32 user: test | 32 user: test |
33 date: Thu Jan 1 00:00:00 1970 | 33 date: Thu Jan 1 00:00:00 1970 |
34 summary: 3 | 34 summary: 3 |
35 | 35 |
37 + hg rawcommit -p 3 -d '0 0' -m4 a | 37 + hg rawcommit -p 3 -d '0 0' -m4 a |
38 + hg manifest 4 | 38 + hg manifest 4 |
39 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | 39 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
40 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | 40 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
41 + hg parents | 41 + hg parents |
42 changeset: 4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1 | 42 changeset: 4:8dfeee82a94b |
43 tag: tip | 43 tag: tip |
44 user: test | 44 user: test |
45 date: Thu Jan 1 00:00:00 1970 | 45 date: Thu Jan 1 00:00:00 1970 |
46 summary: 4 | 46 summary: 4 |
47 | 47 |
50 + hg manifest 5 | 50 + hg manifest 5 |
51 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a | 51 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
52 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | 52 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
53 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c | 53 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
54 + hg parents | 54 + hg parents |
55 changeset: 4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1 | 55 changeset: 4:8dfeee82a94b |
56 user: test | 56 user: test |
57 date: Thu Jan 1 00:00:00 1970 | 57 date: Thu Jan 1 00:00:00 1970 |
58 summary: 4 | 58 summary: 4 |
59 | 59 |
60 + hg rawcommit -p 4 -p 5 -d '0 0' -m6 | 60 + hg rawcommit -p 4 -p 5 -d '0 0' -m6 |
61 + hg manifest 6 | 61 + hg manifest 6 |
62 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | 62 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
63 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | 63 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
64 + hg parents | 64 + hg parents |
65 changeset: 6:c0e932ecae5eb7d8d2af2659f3ab03dbe4a9ff7c | 65 changeset: 6:c0e932ecae5e |
66 tag: tip | 66 tag: tip |
67 parent: 4:8dfeee82a94bbe13e5f3ca5eee08058269af87c1 | 67 parent: 4:8dfeee82a94b |
68 parent: 5:a7925a42d0df7b35e14ecd7bf12ed6bbc776e9df | 68 parent: 5:a7925a42d0df |
69 user: test | 69 user: test |
70 date: Thu Jan 1 00:00:00 1970 | 70 date: Thu Jan 1 00:00:00 1970 |
71 summary: 6 | 71 summary: 6 |
72 | 72 |
73 + hg rawcommit -p 6 -d '0 0' -m7 | 73 + hg rawcommit -p 6 -d '0 0' -m7 |
74 + hg manifest 7 | 74 + hg manifest 7 |
75 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a | 75 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
76 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | 76 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
77 + hg parents | 77 + hg parents |
78 changeset: 7:3a157da4365dc1966cf9a032b0113fd8613d7865 | 78 changeset: 7:3a157da4365d |
79 tag: tip | 79 tag: tip |
80 user: test | 80 user: test |
81 date: Thu Jan 1 00:00:00 1970 | 81 date: Thu Jan 1 00:00:00 1970 |
82 summary: 7 | 82 summary: 7 |
83 | 83 |