tests/test-rebase-obsolete2.t
branchstable
changeset 48796 c00d3ce4e94b
parent 48687 f8f2ecdde4b5
equal deleted inserted replaced
48776:b84ff512b645 48796:c00d3ce4e94b
    45   (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
    45   (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
    46   $ echo C > C
    46   $ echo C > C
    47   $ hg add C
    47   $ hg add C
    48   $ hg commit -m C
    48   $ hg commit -m C
    49   1 new orphan changesets
    49   1 new orphan changesets
       
    50   created new head
    50   $ hg log -G
    51   $ hg log -G
    51   @  4:212cb178bcbb C
    52   @  4:212cb178bcbb C
    52   |
    53   |
    53   | o  3:261e70097290 B2
    54   | o  3:261e70097290 B2
    54   | |
    55   | |
    71   (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
    72   (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
    72   $ echo D > D
    73   $ echo D > D
    73   $ hg add D
    74   $ hg add D
    74   $ hg commit -m D
    75   $ hg commit -m D
    75   1 new orphan changesets
    76   1 new orphan changesets
       
    77   created new head
    76   $ hg --hidden strip -r 'desc(B1)'
    78   $ hg --hidden strip -r 'desc(B1)'
    77   saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
    79   saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
    78   1 new orphan changesets
    80   1 new orphan changesets
    79   $ hg log -G
    81   $ hg log -G
    80   @  5:1a79b7535141 D
    82   @  5:1a79b7535141 D
   192   (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
   194   (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
   193   $ echo "bar" > foo
   195   $ echo "bar" > foo
   194   $ hg add foo
   196   $ hg add foo
   195   $ hg commit -m "bar foo"
   197   $ hg commit -m "bar foo"
   196   1 new orphan changesets
   198   1 new orphan changesets
       
   199   created new head
   197   $ hg log -G
   200   $ hg log -G
   198   @  14:73568ab6879d bar foo
   201   @  14:73568ab6879d bar foo
   199   |
   202   |
   200   | o  13:77d874d096a2 10'
   203   | o  13:77d874d096a2 10'
   201   | |
   204   | |