equal
deleted
inserted
replaced
116 4 |
116 4 |
117 - 725c380fe99b |
117 - 725c380fe99b |
118 $ hg up 3 -q |
118 $ hg up 3 -q |
119 Working directory parent is obsolete |
119 Working directory parent is obsolete |
120 $ mkcommit d # 5 (on 3) |
120 $ mkcommit d # 5 (on 3) |
|
121 1 new unstables changesets |
121 $ qlog -r 'obsolete()' |
122 $ qlog -r 'obsolete()' |
122 3 |
123 3 |
123 - 0d3f46688ccc |
124 - 0d3f46688ccc |
124 |
125 |
125 $ qlog -r 'extinct()' --hidden |
126 $ qlog -r 'extinct()' --hidden |
188 - 1f0dee641bb7 |
189 - 1f0dee641bb7 |
189 $ hg up 3 -q |
190 $ hg up 3 -q |
190 Working directory parent is obsolete |
191 Working directory parent is obsolete |
191 $ mkcommit obsol_d # 6 |
192 $ mkcommit obsol_d # 6 |
192 created new head |
193 created new head |
|
194 1 new unstables changesets |
193 $ hg debugobsolete `getid 5` `getid 6` |
195 $ hg debugobsolete `getid 5` `getid 6` |
194 $ qlog |
196 $ qlog |
195 6 |
197 6 |
196 - 95de7fc6918d |
198 - 95de7fc6918d |
197 4 |
199 4 |
243 |
245 |
244 $ hg up -q .^ # 3 |
246 $ hg up -q .^ # 3 |
245 Working directory parent is obsolete |
247 Working directory parent is obsolete |
246 $ mkcommit "obsol_d'" # 7 |
248 $ mkcommit "obsol_d'" # 7 |
247 created new head |
249 created new head |
|
250 1 new unstables changesets |
248 $ hg debugobsolete `getid 6` `getid 7` |
251 $ hg debugobsolete `getid 6` `getid 7` |
249 $ hg pull -R ../other-new . |
252 $ hg pull -R ../other-new . |
250 pulling from . |
253 pulling from . |
251 searching for changes |
254 searching for changes |
252 adding changesets |
255 adding changesets |
326 |
329 |
327 $ hg up .^ -q # 3 |
330 $ hg up .^ -q # 3 |
328 Working directory parent is obsolete |
331 Working directory parent is obsolete |
329 $ mkcommit "obsol_d''" |
332 $ mkcommit "obsol_d''" |
330 created new head |
333 created new head |
|
334 1 new unstables changesets |
331 $ hg debugobsolete `getid 7` `getid 8` |
335 $ hg debugobsolete `getid 7` `getid 8` |
332 $ cd ../other-new |
336 $ cd ../other-new |
333 $ hg up -q 3 |
337 $ hg up -q 3 |
334 $ hg pull ../local/ |
338 $ hg pull ../local/ |
335 pulling from ../local/ |
339 pulling from ../local/ |
498 check latecomer detection |
502 check latecomer detection |
499 (make an obsolete changeset public) |
503 (make an obsolete changeset public) |
500 |
504 |
501 $ cd local |
505 $ cd local |
502 $ hg phase --public 11 |
506 $ hg phase --public 11 |
|
507 1 new latecomers changesets |
503 $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n' |
508 $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n' |
504 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
509 @ 12 - (draft) 6db5e282cb91 add obsol_d''' |
505 | |
510 | |
506 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
511 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' |
507 |/ |
512 |/ |
588 83b5778897ad |
593 83b5778897ad |
589 909a0fb57e5d 159dfc9fa5d3 |
594 909a0fb57e5d 159dfc9fa5d3 |
590 9468a5f5d8b2 6db5e282cb91 |
595 9468a5f5d8b2 6db5e282cb91 |
591 95de7fc6918d 909a0fb57e5d |
596 95de7fc6918d 909a0fb57e5d |
592 a7a6f2b5d8a5 95de7fc6918d |
597 a7a6f2b5d8a5 95de7fc6918d |
|
598 |
|
599 Check conflict detection |
|
600 |
|
601 $ hg up 9468a5f5d8b2 # add obsol_d'' |
|
602 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
603 $ mkcommit "obsolet_conflicting_d" |
|
604 $ hg summary |
|
605 parent: 14:50f11e5e3a63 tip |
|
606 add obsolet_conflicting_d |
|
607 branch: default |
|
608 commit: (clean) |
|
609 update: 9 new changesets, 9 branch heads (merge) |
|
610 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
|
611 $ hg log -r 'conflicting()' |
|
612 changeset: 14:50f11e5e3a63 |
|
613 tag: tip |
|
614 parent: 11:9468a5f5d8b2 |
|
615 user: test |
|
616 date: Thu Jan 01 00:00:00 1970 +0000 |
|
617 summary: add obsolet_conflicting_d |
|
618 |