equal
deleted
inserted
replaced
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! |
|
134 (use "hg evolve" to update to its successor) |
134 $ mkcommit d # 5 (on 3) |
135 $ mkcommit d # 5 (on 3) |
135 1 new unstable changesets |
136 1 new unstable changesets |
136 $ qlog -r 'obsolete()' |
137 $ qlog -r 'obsolete()' |
137 3 |
138 3 |
138 - 0d3f46688ccc |
139 - 0d3f46688ccc |
181 searching for changes |
182 searching for changes |
182 adding changesets |
183 adding changesets |
183 adding manifests |
184 adding manifests |
184 adding file changes |
185 adding file changes |
185 added 5 changesets with 5 changes to 5 files (+1 heads) |
186 added 5 changesets with 5 changes to 5 files (+1 heads) |
186 pushing 2 obsolescence markers (* bytes) (glob) |
187 pushing 2 obsolescence markers (133 bytes) |
187 2 obsolescence markers added |
188 2 obsolescence markers added |
188 $ hg -R ../other-new verify |
189 $ hg -R ../other-new verify |
189 checking changesets |
190 checking changesets |
190 checking manifests |
191 checking manifests |
191 crosschecking files in changesets and manifests |
192 crosschecking files in changesets and manifests |
236 searching for changes |
237 searching for changes |
237 adding changesets |
238 adding changesets |
238 adding manifests |
239 adding manifests |
239 adding file changes |
240 adding file changes |
240 added 1 changesets with 1 changes to 1 files (+1 heads) |
241 added 1 changesets with 1 changes to 1 files (+1 heads) |
241 pushing 3 obsolescence markers (* bytes) (glob) |
242 pushing 3 obsolescence markers (199 bytes) |
242 1 obsolescence markers added |
243 1 obsolescence markers added |
243 $ qlog -R ../other-new |
244 $ qlog -R ../other-new |
244 5 |
245 5 |
245 - 95de7fc6918d |
246 - 95de7fc6918d |
246 3 |
247 3 |
259 |
260 |
260 $ hg push ../other-new |
261 $ hg push ../other-new |
261 pushing to ../other-new |
262 pushing to ../other-new |
262 searching for changes |
263 searching for changes |
263 no changes found |
264 no changes found |
264 pushing 3 obsolescence markers (* bytes) (glob) |
265 pushing 3 obsolescence markers (199 bytes) |
265 0 obsolescence markers added |
266 0 obsolescence markers added |
266 [1] |
267 [1] |
267 |
268 |
268 $ hg up --hidden -q .^ # 3 |
269 $ hg up --hidden -q .^ # 3 |
269 working directory parent is obsolete! |
270 working directory parent is obsolete! |
541 searching for changes |
542 searching for changes |
542 adding changesets |
543 adding changesets |
543 adding manifests |
544 adding manifests |
544 adding file changes |
545 adding file changes |
545 added 2 changesets with 1 changes to [12] files (re) |
546 added 2 changesets with 1 changes to [12] files (re) |
546 pushing 7 obsolescence markers (* bytes) (glob) |
547 pushing 7 obsolescence markers (491 bytes) |
547 3 obsolescence markers added |
548 3 obsolescence markers added |
548 $ hg up -q 10 |
549 $ hg up -q 10 |
549 $ mkcommit "obsol_d'''" |
550 $ mkcommit "obsol_d'''" |
550 created new head |
551 created new head |
551 $ hg debugobsolete `getid 11` `getid 12` |
552 $ hg debugobsolete `getid 11` `getid 12` |
554 searching for changes |
555 searching for changes |
555 adding changesets |
556 adding changesets |
556 adding manifests |
557 adding manifests |
557 adding file changes |
558 adding file changes |
558 added 1 changesets with 1 changes to 1 files (+1 heads) |
559 added 1 changesets with 1 changes to 1 files (+1 heads) |
559 pushing 8 obsolescence markers (* bytes) (glob) |
560 pushing 8 obsolescence markers (557 bytes) |
560 1 obsolescence markers added |
561 1 obsolescence markers added |
561 $ cd .. |
562 $ cd .. |
562 |
563 |
563 check bumped detection |
564 check bumped detection |
564 (make an obsolete changeset public) |
565 (make an obsolete changeset public) |
703 Check import reports new unstable changeset: |
704 Check import reports new unstable changeset: |
704 |
705 |
705 $ hg up --hidden 2 |
706 $ hg up --hidden 2 |
706 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
707 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
707 working directory parent is obsolete! |
708 working directory parent is obsolete! |
|
709 (use "hg evolve" to update to its successor) |
708 $ hg export 9468a5f5d8b2 | hg import - |
710 $ hg export 9468a5f5d8b2 | hg import - |
709 applying patch from stdin |
711 applying patch from stdin |
710 1 new unstable changesets |
712 1 new unstable changesets |
711 |
713 |
712 |
714 |