equal
deleted
inserted
replaced
119 3 |
119 3 |
120 - 0d3f46688ccc |
120 - 0d3f46688ccc |
121 4 |
121 4 |
122 - 725c380fe99b |
122 - 725c380fe99b |
123 $ hg up --hidden 3 -q |
123 $ hg up --hidden 3 -q |
124 working directory parent is obsolete! |
124 working directory parent is obsolete! (0d3f46688ccc) |
125 (reported by parents too) |
125 (reported by parents too) |
126 $ hg parents |
126 $ hg parents |
127 changeset: 3:0d3f46688ccc |
127 changeset: 3:0d3f46688ccc |
128 parent: 1:7c3bad9141dc |
128 parent: 1:7c3bad9141dc |
129 user: test |
129 user: test |
130 date: Thu Jan 01 00:00:00 1970 +0000 |
130 date: Thu Jan 01 00:00:00 1970 +0000 |
131 summary: add obsol_c |
131 summary: add obsol_c |
132 |
132 |
133 working directory parent is obsolete! |
133 working directory parent is obsolete! (0d3f46688ccc) |
134 (use 'hg evolve' to update to its successor) |
134 (use 'hg evolve' to update to its successor: 725c380fe99b) |
135 $ mkcommit d # 5 (on 3) |
135 $ mkcommit d # 5 (on 3) |
136 1 new unstable changesets |
136 1 new unstable changesets |
137 $ qlog -r 'obsolete()' |
137 $ qlog -r 'obsolete()' |
138 3 |
138 3 |
139 - 0d3f46688ccc |
139 - 0d3f46688ccc |
204 1 |
204 1 |
205 - 7c3bad9141dc |
205 - 7c3bad9141dc |
206 0 |
206 0 |
207 - 1f0dee641bb7 |
207 - 1f0dee641bb7 |
208 $ hg up --hidden 3 -q |
208 $ hg up --hidden 3 -q |
209 working directory parent is obsolete! |
209 working directory parent is obsolete! (0d3f46688ccc) |
210 $ mkcommit obsol_d # 6 |
210 $ mkcommit obsol_d # 6 |
211 created new head |
211 created new head |
212 1 new unstable changesets |
212 1 new unstable changesets |
213 $ hg debugobsolete `getid 5` `getid 6` |
213 $ hg debugobsolete `getid 5` `getid 6` |
214 $ qlog |
214 $ qlog |
261 searching for changes |
261 searching for changes |
262 no changes found |
262 no changes found |
263 [1] |
263 [1] |
264 |
264 |
265 $ hg up --hidden -q .^ # 3 |
265 $ hg up --hidden -q .^ # 3 |
266 working directory parent is obsolete! |
266 working directory parent is obsolete! (0d3f46688ccc) |
267 $ mkcommit "obsol_d'" # 7 |
267 $ mkcommit "obsol_d'" # 7 |
268 created new head |
268 created new head |
269 1 new unstable changesets |
269 1 new unstable changesets |
270 $ hg debugobsolete `getid 6` `getid 7` |
270 $ hg debugobsolete `getid 6` `getid 7` |
271 $ hg pull -R ../other-new . |
271 $ hg pull -R ../other-new . |
349 - 1f0dee641bb7 |
349 - 1f0dee641bb7 |
350 |
350 |
351 Test rollback support |
351 Test rollback support |
352 |
352 |
353 $ hg up --hidden .^ -q # 3 |
353 $ hg up --hidden .^ -q # 3 |
354 working directory parent is obsolete! |
354 working directory parent is obsolete! (0d3f46688ccc) |
355 $ mkcommit "obsol_d''" |
355 $ mkcommit "obsol_d''" |
356 created new head |
356 created new head |
357 1 new unstable changesets |
357 1 new unstable changesets |
358 $ hg debugobsolete `getid 7` `getid 8` |
358 $ hg debugobsolete `getid 7` `getid 8` |
359 $ cd ../other-new |
359 $ cd ../other-new |
685 trouble: divergent |
685 trouble: divergent |
686 summary: add obsolet_conflicting_d |
686 summary: add obsolet_conflicting_d |
687 |
687 |
688 |
688 |
689 $ hg up --hidden 3 -q |
689 $ hg up --hidden 3 -q |
690 working directory parent is obsolete! |
690 working directory parent is obsolete! (0d3f46688ccc) |
691 $ hg evolve |
691 $ hg evolve |
692 parent is obsolete with multiple successors: |
692 parent is obsolete with multiple successors: |
693 [4] add obsol_c' |
693 [4] add obsol_c' |
694 [10] add obsol_c |
694 [10] add obsol_c |
695 [2] |
695 [2] |
702 |
702 |
703 Check import reports new unstable changeset: |
703 Check import reports new unstable changeset: |
704 |
704 |
705 $ hg up --hidden 2 |
705 $ hg up --hidden 2 |
706 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
706 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
707 working directory parent is obsolete! |
707 working directory parent is obsolete! (4538525df7e2) |
708 (use 'hg evolve' to update to its successor) |
708 (4538525df7e2 has diverged, use 'hg evolve -list --divergent' to resolve the issue) |
709 $ hg export 9468a5f5d8b2 | hg import - |
709 $ hg export 9468a5f5d8b2 | hg import - |
710 applying patch from stdin |
710 applying patch from stdin |
711 1 new unstable changesets |
711 1 new unstable changesets |
712 |
712 |
713 |
713 |