comparison tests/test-rawcommit1.out @ 808:8f5637f0a0c0

Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 853bfbf1a312 1f9ec150a476
children 0902ffece4b4
comparison
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
1 + hg --debug init 1 + hg --debug init
2 + echo this is a1
3 + hg add a 2 + hg add a
4 + hg commit -m0 -d '0 0' 3 + hg commit -m0 -d 0 0
5 + echo this is b1
6 + hg add b 4 + hg add b
7 + hg commit -m1 -d '0 0' 5 + hg commit -m1 -d 0 0
8 + hg manifest 1 6 + hg manifest 1
9 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 7 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
10 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b 8 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
11 + echo this is c1 9 + hg rawcommit -p 1 -d 0 0 -m2 c
12 + hg rawcommit -p 1 -d '0 0' -m2 c
13 + hg manifest 2 10 + hg manifest 2
14 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 11 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
15 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b 12 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
16 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 13 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
17 + hg parents 14 + hg parents
19 tag: tip 16 tag: tip
20 user: test 17 user: test
21 date: Thu Jan 1 00:00:00 1970 18 date: Thu Jan 1 00:00:00 1970
22 summary: 2 19 summary: 2
23 20
24 + rm b 21 + hg rawcommit -p 2 -d 0 0 -m3 b
25 + hg rawcommit -p 2 -d '0 0' -m3 b
26 + hg manifest 3 22 + hg manifest 3
27 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 23 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
28 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 24 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
29 + hg parents 25 + hg parents
30 changeset: 3:c8225a106186 26 changeset: 3:c8225a106186
31 tag: tip 27 tag: tip
32 user: test 28 user: test
33 date: Thu Jan 1 00:00:00 1970 29 date: Thu Jan 1 00:00:00 1970
34 summary: 3 30 summary: 3
35 31
36 + echo this is a22 32 + hg rawcommit -p 3 -d 0 0 -m4 a
37 + hg rawcommit -p 3 -d '0 0' -m4 a
38 + hg manifest 4 33 + hg manifest 4
39 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 34 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
40 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 35 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
41 + hg parents 36 + hg parents
42 changeset: 4:8dfeee82a94b 37 changeset: 4:8dfeee82a94b
43 tag: tip 38 tag: tip
44 user: test 39 user: test
45 date: Thu Jan 1 00:00:00 1970 40 date: Thu Jan 1 00:00:00 1970
46 summary: 4 41 summary: 4
47 42
48 + echo this is c22 43 + hg rawcommit -p 1 -d 0 0 -m5 c
49 + hg rawcommit -p 1 -d '0 0' -m5 c
50 + hg manifest 5 44 + hg manifest 5
51 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a 45 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
52 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b 46 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
53 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c 47 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
54 + hg parents 48 + hg parents
55 changeset: 4:8dfeee82a94b 49 changeset: 4:8dfeee82a94b
56 user: test 50 user: test
57 date: Thu Jan 1 00:00:00 1970 51 date: Thu Jan 1 00:00:00 1970
58 summary: 4 52 summary: 4
59 53
60 + hg rawcommit -p 4 -p 5 -d '0 0' -m6 54 + hg rawcommit -p 4 -p 5 -d 0 0 -m6
61 + hg manifest 6 55 + hg manifest 6
62 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 56 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
63 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 57 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
64 + hg parents 58 + hg parents
65 changeset: 6:c0e932ecae5e 59 changeset: 6:c0e932ecae5e
68 parent: 5:a7925a42d0df 62 parent: 5:a7925a42d0df
69 user: test 63 user: test
70 date: Thu Jan 1 00:00:00 1970 64 date: Thu Jan 1 00:00:00 1970
71 summary: 6 65 summary: 6
72 66
73 + hg rawcommit -p 6 -d '0 0' -m7 67 + hg rawcommit -p 6 -d 0 0 -m7
74 + hg manifest 7 68 + hg manifest 7
75 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a 69 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
76 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c 70 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
77 + hg parents 71 + hg parents
78 changeset: 7:3a157da4365d 72 changeset: 7:3a157da4365d