tests/test-rebase-obsolete.t
changeset 34661 eb586ed5d8ce
parent 34290 4f969b9e0cf5
child 34865 a0100f34e20b
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
    23   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
    23   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
    24   adding changesets
    24   adding changesets
    25   adding manifests
    25   adding manifests
    26   adding file changes
    26   adding file changes
    27   added 8 changesets with 7 changes to 7 files (+2 heads)
    27   added 8 changesets with 7 changes to 7 files (+2 heads)
       
    28   new changesets cd010b8cd998:02de42196ebe
    28   (run 'hg heads' to see heads, 'hg merge' to merge)
    29   (run 'hg heads' to see heads, 'hg merge' to merge)
    29   $ hg up tip
    30   $ hg up tip
    30   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    31   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    31   $ hg log -G
    32   $ hg log -G
    32   @  7:02de42196ebe H
    33   @  7:02de42196ebe H
   505   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
   506   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
   506   adding changesets
   507   adding changesets
   507   adding manifests
   508   adding manifests
   508   adding file changes
   509   adding file changes
   509   added 8 changesets with 7 changes to 7 files (+2 heads)
   510   added 8 changesets with 7 changes to 7 files (+2 heads)
       
   511   new changesets cd010b8cd998:02de42196ebe
   510   (run 'hg heads' to see heads, 'hg merge' to merge)
   512   (run 'hg heads' to see heads, 'hg merge' to merge)
   511   $ hg up 3
   513   $ hg up 3
   512   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   514   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   513   $ hg merge 7
   515   $ hg merge 7
   514   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   516   2 files updated, 0 files merged, 0 files removed, 0 files unresolved