equal
deleted
inserted
replaced
400 searching for changes |
400 searching for changes |
401 adding changesets |
401 adding changesets |
402 adding manifests |
402 adding manifests |
403 adding file changes |
403 adding file changes |
404 added 3 changesets with 3 changes to 1 files |
404 added 3 changesets with 3 changes to 1 files |
|
405 OBSEXC: computing relevant nodes |
|
406 OBSEXC: computing markers relevant to 5 nodes |
|
407 OBSEXC: encoding 6 markers |
|
408 OBSEXC: sending 1 pushkey payload (609 bytes) |
|
409 OBSEXC: DONE |
405 |
410 |
406 for simplicity sake we get the bathroom change in line again |
411 for simplicity sake we get the bathroom change in line again |
407 |
412 |
408 $ hg grab 10b8aeaa8cc8 |
413 $ hg grab 10b8aeaa8cc8 |
409 merging shopping |
414 merging shopping |
710 searching for changes |
715 searching for changes |
711 adding changesets |
716 adding changesets |
712 adding manifests |
717 adding manifests |
713 adding file changes |
718 adding file changes |
714 added 2 changesets with 2 changes to 1 files (+1 heads) |
719 added 2 changesets with 2 changes to 1 files (+1 heads) |
|
720 OBSEXC: computing relevant nodes |
|
721 OBSEXC: computing markers relevant to 7 nodes |
|
722 OBSEXC: encoding 10 markers |
|
723 OBSEXC: sending 1 pushkey payload (1004 bytes) |
|
724 OBSEXC: DONE |
715 |
725 |
716 remote get a warning that current working directory is based on an obsolete changeset |
726 remote get a warning that current working directory is based on an obsolete changeset |
717 |
727 |
718 $ cd ../remote |
728 $ cd ../remote |
719 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
729 $ hg pull local # we up again to trigger the warning. it was displayed during the push |