equal
deleted
inserted
replaced
179 searching for changes |
179 searching for changes |
180 adding changesets |
180 adding changesets |
181 adding manifests |
181 adding manifests |
182 adding file changes |
182 adding file changes |
183 added 5 changesets with 5 changes to 5 files (+1 heads) |
183 added 5 changesets with 5 changes to 5 files (+1 heads) |
184 OBSEXC: computing relevant nodes |
|
185 OBSEXC: computing markers relevant to 5 nodes |
|
186 OBSEXC: pushing 2 markers (123 bytes) |
|
187 OBSEXC: DONE |
|
188 $ hg -R ../other-new verify |
184 $ hg -R ../other-new verify |
189 checking changesets |
185 checking changesets |
190 checking manifests |
186 checking manifests |
191 crosschecking files in changesets and manifests |
187 crosschecking files in changesets and manifests |
192 checking files |
188 checking files |
236 searching for changes |
232 searching for changes |
237 adding changesets |
233 adding changesets |
238 adding manifests |
234 adding manifests |
239 adding file changes |
235 adding file changes |
240 added 1 changesets with 1 changes to 1 files (+1 heads) |
236 added 1 changesets with 1 changes to 1 files (+1 heads) |
241 OBSEXC: computing relevant nodes |
|
242 OBSEXC: computing markers relevant to 5 nodes |
|
243 OBSEXC: pushing 3 markers (184 bytes) |
|
244 OBSEXC: DONE |
|
245 $ qlog -R ../other-new |
237 $ qlog -R ../other-new |
246 5 |
238 5 |
247 - 95de7fc6918d |
239 - 95de7fc6918d |
248 3 |
240 3 |
249 - 725c380fe99b |
241 - 725c380fe99b |
261 |
253 |
262 $ hg push ../other-new |
254 $ hg push ../other-new |
263 pushing to ../other-new |
255 pushing to ../other-new |
264 searching for changes |
256 searching for changes |
265 no changes found |
257 no changes found |
266 OBSEXC: computing relevant nodes |
|
267 OBSEXC: computing markers relevant to 5 nodes |
|
268 OBSEXC: pushing 3 markers (184 bytes) |
|
269 OBSEXC: DONE |
|
270 [1] |
258 [1] |
271 |
259 |
272 $ hg up --hidden -q .^ # 3 |
260 $ hg up --hidden -q .^ # 3 |
273 working directory parent is obsolete! |
261 working directory parent is obsolete! |
274 $ mkcommit "obsol_d'" # 7 |
262 $ mkcommit "obsol_d'" # 7 |
280 searching for changes |
268 searching for changes |
281 adding changesets |
269 adding changesets |
282 adding manifests |
270 adding manifests |
283 adding file changes |
271 adding file changes |
284 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
272 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
285 OBSEXC: pull obsolescence markers |
|
286 OBSEXC: merging obsolescence markers (245 bytes) |
|
287 OBSEXC: 1 markers added |
|
288 OBSEXC: DONE |
|
289 (run 'hg heads' to see heads, 'hg merge' to merge) |
273 (run 'hg heads' to see heads, 'hg merge' to merge) |
290 $ qlog -R ../other-new |
274 $ qlog -R ../other-new |
291 6 |
275 6 |
292 - 909a0fb57e5d |
276 - 909a0fb57e5d |
293 3 |
277 3 |
373 searching for changes |
357 searching for changes |
374 adding changesets |
358 adding changesets |
375 adding manifests |
359 adding manifests |
376 adding file changes |
360 adding file changes |
377 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
361 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
378 OBSEXC: pull obsolescence markers |
|
379 OBSEXC: merging obsolescence markers (306 bytes) |
|
380 OBSEXC: 1 markers added |
|
381 OBSEXC: DONE |
|
382 (run 'hg heads' to see heads, 'hg merge' to merge) |
362 (run 'hg heads' to see heads, 'hg merge' to merge) |
383 |
363 |
384 $ hg up -q 7 # to check rollback update behavior |
364 $ hg up -q 7 # to check rollback update behavior |
385 $ qlog |
365 $ qlog |
386 7 |
366 7 |
547 searching for changes |
527 searching for changes |
548 adding changesets |
528 adding changesets |
549 adding manifests |
529 adding manifests |
550 adding file changes |
530 adding file changes |
551 added 2 changesets with 1 changes to [12] files (re) |
531 added 2 changesets with 1 changes to [12] files (re) |
552 OBSEXC: computing relevant nodes |
|
553 OBSEXC: computing markers relevant to 5 nodes |
|
554 OBSEXC: pushing 7 markers (452 bytes) |
|
555 OBSEXC: DONE |
|
556 $ hg up -q 10 |
532 $ hg up -q 10 |
557 $ mkcommit "obsol_d'''" |
533 $ mkcommit "obsol_d'''" |
558 created new head |
534 created new head |
559 $ hg debugobsolete `getid 11` `getid 12` |
535 $ hg debugobsolete `getid 11` `getid 12` |
560 $ hg push ../other-new --traceback |
536 $ hg push ../other-new --traceback |
562 searching for changes |
538 searching for changes |
563 adding changesets |
539 adding changesets |
564 adding manifests |
540 adding manifests |
565 adding file changes |
541 adding file changes |
566 added 1 changesets with 1 changes to 1 files (+1 heads) |
542 added 1 changesets with 1 changes to 1 files (+1 heads) |
567 OBSEXC: computing relevant nodes |
|
568 OBSEXC: computing markers relevant to 5 nodes |
|
569 OBSEXC: pushing 8 markers (513 bytes) |
|
570 OBSEXC: DONE |
|
571 $ cd .. |
543 $ cd .. |
572 |
544 |
573 check bumped detection |
545 check bumped detection |
574 (make an obsolete changeset public) |
546 (make an obsolete changeset public) |
575 |
547 |