equal
deleted
inserted
replaced
78 392fd25390da |
78 392fd25390da |
79 82623d38b9ba |
79 82623d38b9ba |
80 82623d38b9ba |
80 82623d38b9ba |
81 392fd25390da |
81 392fd25390da |
82 392fd25390da |
82 392fd25390da |
83 $ hg log -r 'divergent()' |
83 $ hg log -r 'contentdivergent()' |
84 2:82623d38b9ba A_1 |
84 2:82623d38b9ba A_1 |
85 3:392fd25390da A_2 |
85 3:392fd25390da A_2 |
86 $ hg debugsuccessorssets 'all()' --closest |
86 $ hg debugsuccessorssets 'all()' --closest |
87 d20a80d4def3 |
87 d20a80d4def3 |
88 d20a80d4def3 |
88 d20a80d4def3 |
145 82623d38b9ba |
145 82623d38b9ba |
146 392fd25390da |
146 392fd25390da |
147 01f36c5a8fda |
147 01f36c5a8fda |
148 01f36c5a8fda |
148 01f36c5a8fda |
149 01f36c5a8fda |
149 01f36c5a8fda |
150 $ hg log -r 'divergent()' |
150 $ hg log -r 'contentdivergent()' |
151 2:82623d38b9ba A_1 |
151 2:82623d38b9ba A_1 |
152 4:01f36c5a8fda A_3 |
152 4:01f36c5a8fda A_3 |
153 $ hg debugsuccessorssets 'all()' --closest |
153 $ hg debugsuccessorssets 'all()' --closest |
154 d20a80d4def3 |
154 d20a80d4def3 |
155 d20a80d4def3 |
155 d20a80d4def3 |
197 392fd25390da |
197 392fd25390da |
198 82623d38b9ba |
198 82623d38b9ba |
199 82623d38b9ba |
199 82623d38b9ba |
200 392fd25390da |
200 392fd25390da |
201 392fd25390da |
201 392fd25390da |
202 $ hg log -r 'divergent()' |
202 $ hg log -r 'contentdivergent()' |
203 2:82623d38b9ba A_1 |
203 2:82623d38b9ba A_1 |
204 3:392fd25390da A_2 |
204 3:392fd25390da A_2 |
205 $ hg debugsuccessorssets 'all()' --closest |
205 $ hg debugsuccessorssets 'all()' --closest |
206 d20a80d4def3 |
206 d20a80d4def3 |
207 d20a80d4def3 |
207 d20a80d4def3 |
276 01f36c5a8fda |
276 01f36c5a8fda |
277 392fd25390da |
277 392fd25390da |
278 01f36c5a8fda |
278 01f36c5a8fda |
279 01f36c5a8fda |
279 01f36c5a8fda |
280 01f36c5a8fda |
280 01f36c5a8fda |
281 $ hg log -r 'divergent()' |
281 $ hg log -r 'contentdivergent()' |
282 $ hg debugsuccessorssets 'all()' --closest |
282 $ hg debugsuccessorssets 'all()' --closest |
283 d20a80d4def3 |
283 d20a80d4def3 |
284 d20a80d4def3 |
284 d20a80d4def3 |
285 01f36c5a8fda |
285 01f36c5a8fda |
286 01f36c5a8fda |
286 01f36c5a8fda |
320 82623d38b9ba 392fd25390da |
320 82623d38b9ba 392fd25390da |
321 82623d38b9ba |
321 82623d38b9ba |
322 82623d38b9ba |
322 82623d38b9ba |
323 392fd25390da |
323 392fd25390da |
324 392fd25390da |
324 392fd25390da |
325 $ hg log -r 'divergent()' |
325 $ hg log -r 'contentdivergent()' |
326 $ hg debugsuccessorssets 'all()' --closest |
326 $ hg debugsuccessorssets 'all()' --closest |
327 d20a80d4def3 |
327 d20a80d4def3 |
328 d20a80d4def3 |
328 d20a80d4def3 |
329 82623d38b9ba |
329 82623d38b9ba |
330 82623d38b9ba |
330 82623d38b9ba |
408 01f36c5a8fda |
408 01f36c5a8fda |
409 6a411f0d7a0a |
409 6a411f0d7a0a |
410 e442cfc57690 |
410 e442cfc57690 |
411 e442cfc57690 |
411 e442cfc57690 |
412 e442cfc57690 |
412 e442cfc57690 |
413 $ hg log -r 'divergent()' |
413 $ hg log -r 'contentdivergent()' |
414 |
414 |
415 Check more complex obsolescence graft (with divergence) |
415 Check more complex obsolescence graft (with divergence) |
416 |
416 |
417 $ mkcommit B_0; hg up 0 |
417 $ mkcommit B_0; hg up 0 |
418 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
418 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
513 7ae126973a96 |
513 7ae126973a96 |
514 14608b260df8 |
514 14608b260df8 |
515 14608b260df8 |
515 14608b260df8 |
516 bed64f5d2f5a |
516 bed64f5d2f5a |
517 bed64f5d2f5a |
517 bed64f5d2f5a |
518 $ hg log -r 'divergent()' |
518 $ hg log -r 'contentdivergent()' |
519 4:01f36c5a8fda A_3 |
519 4:01f36c5a8fda A_3 |
520 8:7ae126973a96 A_7 |
520 8:7ae126973a96 A_7 |
521 9:14608b260df8 A_8 |
521 9:14608b260df8 A_8 |
522 10:bed64f5d2f5a A_9 |
522 10:bed64f5d2f5a A_9 |
523 |
523 |
612 a139f71be9da |
612 a139f71be9da |
613 bed64f5d2f5a |
613 bed64f5d2f5a |
614 a139f71be9da |
614 a139f71be9da |
615 a139f71be9da |
615 a139f71be9da |
616 a139f71be9da |
616 a139f71be9da |
617 $ hg log -r 'divergent()' |
617 $ hg log -r 'contentdivergent()' |
618 |
618 |
619 $ cd .. |
619 $ cd .. |
620 |
620 |
621 |
621 |
622 Subset does not diverge |
622 Subset does not diverge |