Show More
@@ -1,19 +1,19 b'' | |||||
1 | # basic operation |
|
1 | # basic operation | |
2 | adding a |
|
2 | adding a | |
3 |
changeset 2: |
|
3 | changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 | |
4 | a |
|
4 | a | |
5 | # file that was removed is recreated |
|
5 | # file that was removed is recreated | |
6 | adding a |
|
6 | adding a | |
7 | adding a |
|
7 | adding a | |
8 |
changeset 2: |
|
8 | changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 | |
9 | content |
|
9 | content | |
10 | # backout of backout is as if nothing happened |
|
10 | # backout of backout is as if nothing happened | |
11 | removing a |
|
11 | removing a | |
12 |
changeset 3: |
|
12 | changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a | |
13 | cat: a: No such file or directory |
|
13 | cat: a: No such file or directory | |
14 | # backout with merge |
|
14 | # backout with merge | |
15 | adding a |
|
15 | adding a | |
16 |
changeset 3: |
|
16 | changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 | |
17 | merging with changeset 2:b66ea5b77abb |
|
17 | merging with changeset 2:b66ea5b77abb | |
18 | merging a |
|
18 | merging a | |
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -6,40 +6,40 b' 29a31' | |||||
6 | 43a46 |
|
6 | 43a46 | |
7 | > files: |
|
7 | > files: | |
8 | # compact style works |
|
8 | # compact style works | |
9 |
3[tip] |
|
9 | 3[tip] 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
10 | no user, no domain |
|
10 | no user, no domain | |
11 |
|
11 | |||
12 |
2 |
|
12 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
13 | no person |
|
13 | no person | |
14 |
|
14 | |||
15 |
1 |
|
15 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
16 | other 1 |
|
16 | other 1 | |
17 |
|
17 | |||
18 |
0 |
|
18 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
19 | line 1 |
|
19 | line 1 | |
20 |
|
20 | |||
21 |
3[tip] |
|
21 | 3[tip] 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
22 | no user, no domain |
|
22 | no user, no domain | |
23 |
|
23 | |||
24 |
2 |
|
24 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
25 | no person |
|
25 | no person | |
26 |
|
26 | |||
27 |
1 |
|
27 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
28 | other 1 |
|
28 | other 1 | |
29 |
|
29 | |||
30 |
0 |
|
30 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
31 | line 1 |
|
31 | line 1 | |
32 |
|
32 | |||
33 |
3[tip]:2,-1 |
|
33 | 3[tip]:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
34 | no user, no domain |
|
34 | no user, no domain | |
35 |
|
35 | |||
36 |
2:1,-1 |
|
36 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other | |
37 | no person |
|
37 | no person | |
38 |
|
38 | |||
39 |
1:0,-1 |
|
39 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
40 | other 1 |
|
40 | other 1 | |
41 |
|
41 | |||
42 |
0:-1,-1 |
|
42 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
43 | line 1 |
|
43 | line 1 | |
44 |
|
44 | |||
45 | # error if style not readable |
|
45 | # error if style not readable | |
@@ -103,30 +103,24 b' desc: other 1' | |||||
103 | other 2 |
|
103 | other 2 | |
104 |
|
104 | |||
105 | other 3 |
|
105 | other 3 | |
106 |
|
||||
107 | desc: line 1 |
|
106 | desc: line 1 | |
108 | line 2 |
|
107 | line 2 | |
109 |
|
||||
110 | desc--verbose: no user, no domain |
|
108 | desc--verbose: no user, no domain | |
111 | desc--verbose: no person |
|
109 | desc--verbose: no person | |
112 | desc--verbose: other 1 |
|
110 | desc--verbose: other 1 | |
113 | other 2 |
|
111 | other 2 | |
114 |
|
112 | |||
115 | other 3 |
|
113 | other 3 | |
116 |
|
||||
117 | desc--verbose: line 1 |
|
114 | desc--verbose: line 1 | |
118 | line 2 |
|
115 | line 2 | |
119 |
|
||||
120 | desc--debug: no user, no domain |
|
116 | desc--debug: no user, no domain | |
121 | desc--debug: no person |
|
117 | desc--debug: no person | |
122 | desc--debug: other 1 |
|
118 | desc--debug: other 1 | |
123 | other 2 |
|
119 | other 2 | |
124 |
|
120 | |||
125 | other 3 |
|
121 | other 3 | |
126 |
|
||||
127 | desc--debug: line 1 |
|
122 | desc--debug: line 1 | |
128 | line 2 |
|
123 | line 2 | |
129 |
|
||||
130 | file_adds: |
|
124 | file_adds: | |
131 | file_adds: |
|
125 | file_adds: | |
132 | file_adds: |
|
126 | file_adds: | |
@@ -175,18 +169,18 b' manifest--debug: 3:cb5a1327723b' | |||||
175 | manifest--debug: 2:6e0e82995c35 |
|
169 | manifest--debug: 2:6e0e82995c35 | |
176 | manifest--debug: 1:4e8d705b1e53 |
|
170 | manifest--debug: 1:4e8d705b1e53 | |
177 | manifest--debug: 0:a0c8bcbbb45c |
|
171 | manifest--debug: 0:a0c8bcbbb45c | |
178 | node: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
172 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
179 | node: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
173 | node: 97054abb4ab824450e9164180baf491ae0078465 | |
180 | node: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
174 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
181 | node: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
175 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
182 | node--verbose: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
176 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
183 | node--verbose: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
177 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
184 | node--verbose: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
178 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
185 | node--verbose: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
179 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
186 | node--debug: 8c7f028fbabf93fde80ef788885370b36abeff33 |
|
180 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
187 | node--debug: 259081bc29d176c6ae17af5dd01a3440b3288c97 |
|
181 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
188 | node--debug: 1c37ba7745099d0f206b3a663abcfe127b037433 |
|
182 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
189 | node--debug: 6eb5362d59ec784e4431d3e140c8cc6e1b77ce82 |
|
183 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
190 | parents: |
|
184 | parents: | |
191 | parents: |
|
185 | parents: | |
192 | parents: |
|
186 | parents: | |
@@ -195,9 +189,9 b' parents--verbose:' | |||||
195 | parents--verbose: |
|
189 | parents--verbose: | |
196 | parents--verbose: |
|
190 | parents--verbose: | |
197 | parents--verbose: |
|
191 | parents--verbose: | |
198 |
parents--debug: 2: |
|
192 | parents--debug: 2:97054abb4ab8 -1:000000000000 | |
199 |
parents--debug: 1: |
|
193 | parents--debug: 1:b608e9d1a3f0 -1:000000000000 | |
200 |
parents--debug: 0: |
|
194 | parents--debug: 0:1e4e1b8f71e0 -1:000000000000 | |
201 | parents--debug: -1:000000000000 -1:000000000000 |
|
195 | parents--debug: -1:000000000000 -1:000000000000 | |
202 | rev: 3 |
|
196 | rev: 3 | |
203 | rev: 2 |
|
197 | rev: 2 | |
@@ -252,10 +246,10 b' no user, no domain' | |||||
252 | no person |
|
246 | no person | |
253 | other 1 |
|
247 | other 1 | |
254 | line 1 |
|
248 | line 1 | |
255 | 8c7f028fbabf |
|
249 | 10e46f2dcbf4 | |
256 | 259081bc29d1 |
|
250 | 97054abb4ab8 | |
257 | 1c37ba774509 |
|
251 | b608e9d1a3f0 | |
258 | 6eb5362d59ec |
|
252 | 1e4e1b8f71e0 | |
259 | # error on syntax |
|
253 | # error on syntax | |
260 | abort: t:3: unmatched quotes |
|
254 | abort: t:3: unmatched quotes | |
261 | # done |
|
255 | # done |
General Comments 0
You need to be logged in to leave comments.
Login now