equal
deleted
inserted
replaced
132 summary: add obsol_c |
132 summary: add obsol_c |
133 |
133 |
134 working directory parent is obsolete! (0d3f46688ccc) |
134 working directory parent is obsolete! (0d3f46688ccc) |
135 (use 'hg evolve' to update to its successor: 725c380fe99b) |
135 (use 'hg evolve' to update to its successor: 725c380fe99b) |
136 $ mkcommit d # 5 (on 3) |
136 $ mkcommit d # 5 (on 3) |
137 1 new unstable changesets |
137 1 new orphan changesets |
138 $ qlog -r 'obsolete()' |
138 $ qlog -r 'obsolete()' |
139 3 |
139 3 |
140 - 0d3f46688ccc |
140 - 0d3f46688ccc |
141 |
141 |
142 $ qlog -r 'extinct()' --hidden |
142 $ qlog -r 'extinct()' --hidden |
208 - 1f0dee641bb7 |
208 - 1f0dee641bb7 |
209 $ hg up --hidden 3 -q |
209 $ hg up --hidden 3 -q |
210 working directory parent is obsolete! (0d3f46688ccc) |
210 working directory parent is obsolete! (0d3f46688ccc) |
211 $ mkcommit obsol_d # 6 |
211 $ mkcommit obsol_d # 6 |
212 created new head |
212 created new head |
213 1 new unstable changesets |
213 1 new orphan changesets |
214 $ hg debugobsolete `getid 5` `getid 6` |
214 $ hg debugobsolete `getid 5` `getid 6` |
215 obsoleted 1 changesets |
215 obsoleted 1 changesets |
216 $ qlog |
216 $ qlog |
217 6 |
217 6 |
218 - 95de7fc6918d |
218 - 95de7fc6918d |
267 |
267 |
268 $ hg up --hidden -q .^ # 3 |
268 $ hg up --hidden -q .^ # 3 |
269 working directory parent is obsolete! (0d3f46688ccc) |
269 working directory parent is obsolete! (0d3f46688ccc) |
270 $ mkcommit "obsol_d'" # 7 |
270 $ mkcommit "obsol_d'" # 7 |
271 created new head |
271 created new head |
272 1 new unstable changesets |
272 1 new orphan changesets |
273 $ hg debugobsolete `getid 6` `getid 7` |
273 $ hg debugobsolete `getid 6` `getid 7` |
274 obsoleted 1 changesets |
274 obsoleted 1 changesets |
275 $ hg pull -R ../other-new . |
275 $ hg pull -R ../other-new . |
276 pulling from . |
276 pulling from . |
277 searching for changes |
277 searching for changes |
357 |
357 |
358 $ hg up --hidden .^ -q # 3 |
358 $ hg up --hidden .^ -q # 3 |
359 working directory parent is obsolete! (0d3f46688ccc) |
359 working directory parent is obsolete! (0d3f46688ccc) |
360 $ mkcommit "obsol_d''" |
360 $ mkcommit "obsol_d''" |
361 created new head |
361 created new head |
362 1 new unstable changesets |
362 1 new orphan changesets |
363 $ hg debugobsolete `getid 7` `getid 8` |
363 $ hg debugobsolete `getid 7` `getid 8` |
364 obsoleted 1 changesets |
364 obsoleted 1 changesets |
365 $ cd ../other-new |
365 $ cd ../other-new |
366 $ hg up -q 3 |
366 $ hg up -q 3 |
367 $ hg pull ../local/ |
367 $ hg pull ../local/ |
720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
721 working directory parent is obsolete! (4538525df7e2) |
721 working directory parent is obsolete! (4538525df7e2) |
722 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
722 (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
723 $ hg export 9468a5f5d8b2 | hg import - |
723 $ hg export 9468a5f5d8b2 | hg import - |
724 applying patch from stdin |
724 applying patch from stdin |
725 1 new unstable changesets |
725 1 new orphan changesets |
726 |
726 |
727 |
727 |
728 Relevant marker computation |
728 Relevant marker computation |
729 ============================== |
729 ============================== |
730 |
730 |