35 user: test |
35 user: test |
36 date: Thu Jan 01 00:00:00 1970 +0000 |
36 date: Thu Jan 01 00:00:00 1970 +0000 |
37 summary: ROOT |
37 summary: ROOT |
38 |
38 |
39 $ hg update --hidden 'desc(A0)' |
39 $ hg update --hidden 'desc(A0)' |
40 updating to a hidden changeset 471f378eab4c |
|
41 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
|
42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 working directory parent is obsolete! (471f378eab4c) |
41 working directory parent is obsolete! (471f378eab4c) |
44 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
42 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
45 $ hg amend -m "A2" |
43 $ hg amend -m "A2" |
46 2 new content-divergent changesets |
|
47 $ hg log --hidden -G |
44 $ hg log --hidden -G |
48 @ changeset: 3:65b757b745b9 |
45 @ changeset: 3:65b757b745b9 |
49 | tag: tip |
46 | tag: tip |
50 | parent: 0:ea207398892e |
47 | parent: 0:ea207398892e |
51 | user: test |
48 | user: test |
52 | date: Thu Jan 01 00:00:00 1970 +0000 |
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
53 | instability: content-divergent |
50 | instability: content-divergent |
54 | summary: A2 |
51 | summary: A2 |
55 | |
52 | |
56 | * changeset: 2:fdf9bde5129a |
53 | o changeset: 2:fdf9bde5129a |
57 |/ parent: 0:ea207398892e |
54 |/ parent: 0:ea207398892e |
58 | user: test |
55 | user: test |
59 | date: Thu Jan 01 00:00:00 1970 +0000 |
56 | date: Thu Jan 01 00:00:00 1970 +0000 |
60 | instability: content-divergent |
57 | instability: content-divergent |
61 | summary: A1 |
58 | summary: A1 |
98 |
95 |
99 Check that with all option, every changeset is shown |
96 Check that with all option, every changeset is shown |
100 $ hg obslog --hidden --all 471f378eab4c --patch |
97 $ hg obslog --hidden --all 471f378eab4c --patch |
101 @ 65b757b745b9 (3) A2 |
98 @ 65b757b745b9 (3) A2 |
102 | |
99 | |
103 | * fdf9bde5129a (2) A1 |
100 | o fdf9bde5129a (2) A1 |
104 |/ |
101 |/ |
105 x 471f378eab4c (1) A0 |
102 x 471f378eab4c (1) A0 |
106 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
103 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
107 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
104 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
108 --- a/changeset-description |
105 --- a/changeset-description |
161 } |
158 } |
162 ] |
159 ] |
163 Check that debugobshistory on the first diverged revision show the revision |
160 Check that debugobshistory on the first diverged revision show the revision |
164 and the diverent one |
161 and the diverent one |
165 $ hg obslog fdf9bde5129a --patch |
162 $ hg obslog fdf9bde5129a --patch |
166 * fdf9bde5129a (2) A1 |
163 o fdf9bde5129a (2) A1 |
167 | |
164 | |
168 x 471f378eab4c (1) A0 |
165 x 471f378eab4c (1) A0 |
169 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
166 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
170 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
167 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
171 --- a/changeset-description |
168 --- a/changeset-description |
186 |
183 |
187 Check that all option show all of them |
184 Check that all option show all of them |
188 $ hg obslog fdf9bde5129a -a --patch |
185 $ hg obslog fdf9bde5129a -a --patch |
189 @ 65b757b745b9 (3) A2 |
186 @ 65b757b745b9 (3) A2 |
190 | |
187 | |
191 | * fdf9bde5129a (2) A1 |
188 | o fdf9bde5129a (2) A1 |
192 |/ |
189 |/ |
193 x 471f378eab4c (1) A0 |
190 x 471f378eab4c (1) A0 |
194 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
191 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
195 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
192 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
196 --- a/changeset-description |
193 --- a/changeset-description |
233 |
230 |
234 Check that all option show all of them |
231 Check that all option show all of them |
235 $ hg obslog 65b757b745b9 -a --patch |
232 $ hg obslog 65b757b745b9 -a --patch |
236 @ 65b757b745b9 (3) A2 |
233 @ 65b757b745b9 (3) A2 |
237 | |
234 | |
238 | * fdf9bde5129a (2) A1 |
235 | o fdf9bde5129a (2) A1 |
239 |/ |
236 |/ |
240 x 471f378eab4c (1) A0 |
237 x 471f378eab4c (1) A0 |
241 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
238 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
242 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
239 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
243 --- a/changeset-description |
240 --- a/changeset-description |
258 Check that debugobshistory on the both diverged revision show a coherent |
255 Check that debugobshistory on the both diverged revision show a coherent |
259 graph |
256 graph |
260 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch |
257 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch |
261 @ 65b757b745b9 (3) A2 |
258 @ 65b757b745b9 (3) A2 |
262 | |
259 | |
263 | * fdf9bde5129a (2) A1 |
260 | o fdf9bde5129a (2) A1 |
264 |/ |
261 |/ |
265 x 471f378eab4c (1) A0 |
262 x 471f378eab4c (1) A0 |
266 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
263 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
267 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
264 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
268 --- a/changeset-description |
265 --- a/changeset-description |
335 $ hg update 471f378eab4c |
332 $ hg update 471f378eab4c |
336 abort: hidden revision '471f378eab4c'! |
333 abort: hidden revision '471f378eab4c'! |
337 (use --hidden to access hidden revisions; diverged) |
334 (use --hidden to access hidden revisions; diverged) |
338 [255] |
335 [255] |
339 $ hg update --hidden 'desc(A0)' |
336 $ hg update --hidden 'desc(A0)' |
340 updating to a hidden changeset 471f378eab4c |
|
341 (hidden revision '471f378eab4c' has diverged) |
|
342 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
343 working directory parent is obsolete! (471f378eab4c) |
338 working directory parent is obsolete! (471f378eab4c) |
344 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
339 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |