60 |
60 |
61 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
61 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
62 1 changesets pruned |
62 1 changesets pruned |
63 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
63 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
64 1 changesets pruned |
64 1 changesets pruned |
65 2 new content-divergent changesets |
|
66 |
65 |
67 $ hg log -G |
66 $ hg log -G |
68 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
67 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
69 | |
68 | |
70 | * 2:593c57f2117e@default(draft) divergent [content-divergent] |
69 | o 2:593c57f2117e@default(draft) divergent [content-divergent] |
71 |/ |
70 |/ |
72 o 0:9092f1db7931@default(draft) added a [] |
71 o 0:9092f1db7931@default(draft) added a [] |
73 |
72 |
74 |
73 |
75 $ hg evolve --all --any --content-divergent --update |
74 $ hg evolve --all --any --content-divergent --update |
118 |
117 |
119 $ hg prune -s b2ae71172042 48819a835615 |
118 $ hg prune -s b2ae71172042 48819a835615 |
120 1 changesets pruned |
119 1 changesets pruned |
121 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden |
120 $ hg prune -s e3ff64ce8d4c 48819a835615 --hidden |
122 1 changesets pruned |
121 1 changesets pruned |
123 2 new content-divergent changesets |
|
124 |
122 |
125 $ hg log -G |
123 $ hg log -G |
126 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
124 @ 7:b2ae71172042@default(draft) add _c [content-divergent] |
127 | |
125 | |
128 | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
126 | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |
129 |/ |
127 |/ |
130 | o 4:45bf1312f454@default(draft) divergent [] |
128 | o 4:45bf1312f454@default(draft) divergent [] |
131 |/ |
129 |/ |
132 o 0:9092f1db7931@default(draft) added a [] |
130 o 0:9092f1db7931@default(draft) added a [] |
133 |
131 |
173 |
171 |
174 $ hg prune -s 6b096fb45070 37445b16603b |
172 $ hg prune -s 6b096fb45070 37445b16603b |
175 1 changesets pruned |
173 1 changesets pruned |
176 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden |
174 $ hg prune -s 05a6b6a9e633 37445b16603b --hidden |
177 1 changesets pruned |
175 1 changesets pruned |
178 2 new content-divergent changesets |
|
179 $ hg log -G |
176 $ hg log -G |
180 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] |
177 @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] |
181 | |
178 | |
182 | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |
179 | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |
183 |/ |
180 |/ |
184 o 0:135f39f4bd78@default(draft) add _a [] |
181 o 0:135f39f4bd78@default(draft) add _a [] |
185 |
182 |
186 |
183 |
187 $ cat >$TESTTMP/test_extension.py << EOF |
184 $ cat >$TESTTMP/test_extension.py << EOF |
247 created new head |
244 created new head |
248 |
245 |
249 Lets create divergence |
246 Lets create divergence |
250 $ hg prune 4 -s . --hidden |
247 $ hg prune 4 -s . --hidden |
251 1 changesets pruned |
248 1 changesets pruned |
252 2 new content-divergent changesets |
|
253 |
249 |
254 Making obsolete resolution parent |
250 Making obsolete resolution parent |
255 $ hg prune 3 |
251 $ hg prune 3 |
256 1 changesets pruned |
252 1 changesets pruned |
257 1 new orphan changesets |
|
258 |
253 |
259 $ hg glog |
254 $ hg glog |
260 @ 6:de4ea3103326 updated e |
255 @ 6:de4ea3103326 updated e |
261 | () [default] draft |
256 | () [default] draft |
262 | * 5:ff6f7cd76a7c updated e |
257 | o 5:ff6f7cd76a7c updated e |
263 | | () [default] draft |
258 | | () [default] draft |
264 | x 3:9150fe93bec6 added d |
259 | x 3:9150fe93bec6 added d |
265 | | () [default] draft |
260 | | () [default] draft |
266 | o 2:155349b645be added c |
261 | o 2:155349b645be added c |
267 |/ () [default] draft |
262 |/ () [default] draft |
334 $ hg amend |
329 $ hg amend |
335 |
330 |
336 create some content divergence |
331 create some content divergence |
337 |
332 |
338 $ hg co dff6e52f5e41 --hidden |
333 $ hg co dff6e52f5e41 --hidden |
339 updating to a hidden changeset dff6e52f5e41 |
|
340 (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) |
|
341 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
342 working directory parent is obsolete! (dff6e52f5e41) |
335 working directory parent is obsolete! (dff6e52f5e41) |
343 (use 'hg evolve' to update to its successor: 0825dcee2670) |
336 (use 'hg evolve' to update to its successor: 0825dcee2670) |
344 $ hg revert -r .^ c |
337 $ hg revert -r .^ c |
345 $ hg amend |
338 $ hg amend |
346 2 new content-divergent changesets |
|
347 $ hg glog --hidden |
339 $ hg glog --hidden |
348 @ 3:92ecd58f9b05 delete a |
340 @ 3:92ecd58f9b05 delete a |
349 | () [default] draft |
341 | () [default] draft |
350 | * 2:0825dcee2670 delete a |
342 | o 2:0825dcee2670 delete a |
351 |/ () [default] draft |
343 |/ () [default] draft |
352 | x 1:dff6e52f5e41 delete a |
344 | x 1:dff6e52f5e41 delete a |
353 |/ () [default] draft |
345 |/ () [default] draft |
354 o 0:75d2b02c4a5c initial |
346 o 0:75d2b02c4a5c initial |
355 () [default] draft |
347 () [default] draft |