tests/test-rebase-collapse.t
changeset 34661 eb586ed5d8ce
parent 34290 4f969b9e0cf5
child 35385 469b06b4c3ca
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
    18   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
    18   $ hg unbundle "$TESTDIR/bundles/rebase.hg"
    19   adding changesets
    19   adding changesets
    20   adding manifests
    20   adding manifests
    21   adding file changes
    21   adding file changes
    22   added 8 changesets with 7 changes to 7 files (+2 heads)
    22   added 8 changesets with 7 changes to 7 files (+2 heads)
       
    23   new changesets cd010b8cd998:02de42196ebe
    23   (run 'hg heads' to see heads, 'hg merge' to merge)
    24   (run 'hg heads' to see heads, 'hg merge' to merge)
    24   $ hg up tip
    25   $ hg up tip
    25   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    26   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    26 
    27 
    27   $ hg tglog
    28   $ hg tglog
   639   $ hg unbundle "$TESTDIR/bundles/renames.hg"
   640   $ hg unbundle "$TESTDIR/bundles/renames.hg"
   640   adding changesets
   641   adding changesets
   641   adding manifests
   642   adding manifests
   642   adding file changes
   643   adding file changes
   643   added 4 changesets with 11 changes to 7 files (+1 heads)
   644   added 4 changesets with 11 changes to 7 files (+1 heads)
       
   645   new changesets f447d5abf5ea:338e84e2e558
   644   (run 'hg heads' to see heads, 'hg merge' to merge)
   646   (run 'hg heads' to see heads, 'hg merge' to merge)
   645   $ hg up -q tip
   647   $ hg up -q tip
   646   $ hg tglog
   648   $ hg tglog
   647   @  3: 'move2'
   649   @  3: 'move2'
   648   |
   650   |