##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Add rawcommit tests...
mpm@selenic.com -
r444:2cdcb4be default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,33 b''
1 #!/bin/sh -x
2 hg -d init
3 echo this is a1 > a
4 hg -d add a
5 hg -d commit -t0 -d "0 0" -u user
6 echo this is b1 > b
7 hg -d add b
8 hg -d commit -t1 -d "0 0" -u user
9 hg -d manifest 1
10 echo this is c1 > c
11 hg -d rawcommit -p 1 -d "0 0" -u user -t2 c
12 hg -d manifest 2
13 hg -d parents
14 rm b
15 hg -d rawcommit -p 2 -d "0 0" -u user -t3 b
16 hg -d manifest 3
17 hg -d parents
18 echo this is a22 > a
19 hg -d rawcommit -p 3 -d "0 0" -u user -t4 a
20 hg -d manifest 4
21 hg -d parents
22 echo this is c22 > c
23 hg -d rawcommit -p 1 -d "0 0" -u user -t5 c
24 hg -d manifest 5
25 hg -d parents
26 # merge, but no files changed
27 hg -d rawcommit -p 4 -p 5 -d "0 0" -u user -t6
28 hg -d manifest 6
29 hg -d parents
30 # no changes what-so-ever
31 hg -d rawcommit -p 6 -d "0 0" -u user -t7
32 hg -d manifest 7
33 hg -d parents
Show file before | Show file after | Hide comments
@@ -0,0 +1,113 b''
1 + hg -d init
2 + echo this is a1
3 + hg -d add a
4 + hg -d commit -t0 -d '0 0' -u user
5 a
6 + echo this is b1
7 + hg -d add b
8 + hg -d commit -t1 -d '0 0' -u user
9 b
10 + hg -d manifest 1
11 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
12 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
13 + echo this is c1
14 + hg -d rawcommit -p 1 -d '0 0' -u user -t2 c
15 + hg -d manifest 2
16 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
17 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
18 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
19 + hg -d parents
20 changeset: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
21 tag: tip
22 parent: 1:3cefbe5cc27b3a068b7a6899ddff22a9874a7e69
23 parent: -1:0000000000000000000000000000000000000000
24 manifest: 2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6
25 user: user
26 date: Thu Jan 1 00:00:00 1970
27 files: c
28 description:
29 2
30
31 + rm b
32 + hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
33 + hg -d manifest 3
34 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
35 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
36 + hg -d parents
37 changeset: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff
38 tag: tip
39 parent: 2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
40 parent: -1:0000000000000000000000000000000000000000
41 manifest: 3:1102cb6dde652ec2ba8cc2777e464853afa67cef
42 user: user
43 date: Thu Jan 1 00:00:00 1970
44 files: b
45 description:
46 3
47
48 + echo this is a22
49 + hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
50 + hg -d manifest 4
51 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
52 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
53 + hg -d parents
54 changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
55 tag: tip
56 parent: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff
57 parent: -1:0000000000000000000000000000000000000000
58 manifest: 4:cf4021621d6357e928385ffeee996f87c0bf991d
59 user: user
60 date: Thu Jan 1 00:00:00 1970
61 files: a
62 description:
63 4
64
65 + echo this is c22
66 + hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
67 + hg -d manifest 5
68 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
69 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
70 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
71 + hg -d parents
72 changeset: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
73 parent: 3:923669243607c26c4c8f0c11f48c1182ce1a7aff
74 parent: -1:0000000000000000000000000000000000000000
75 manifest: 4:cf4021621d6357e928385ffeee996f87c0bf991d
76 user: user
77 date: Thu Jan 1 00:00:00 1970
78 files: a
79 description:
80 4
81
82 + hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
83 + hg -d manifest 6
84 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
85 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
86 + hg -d parents
87 changeset: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
88 tag: tip
89 parent: 4:2361ec7b1da5142bce1285c50f3bb2960706263d
90 parent: 5:f8292b00383d88b470efcb2ea9c71409832ec9d6
91 manifest: 6:71c4262e09a89666ee12a92fefa12085aad53243
92 user: user
93 date: Thu Jan 1 00:00:00 1970
94 files:
95 description:
96 6
97
98 + hg -d rawcommit -p 6 -d '0 0' -u user -t7
99 + hg -d manifest 7
100 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
101 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
102 + hg -d parents
103 changeset: 7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
104 tag: tip
105 parent: 6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
106 parent: -1:0000000000000000000000000000000000000000
107 manifest: 7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2
108 user: user
109 date: Thu Jan 1 00:00:00 1970
110 files:
111 description:
112 7
113
General Comments 0
You need to be logged in to leave comments. Login now