tests/test-rebase-cache.t
changeset 17005 50f434510da6
parent 16913 f2719b387380
child 17013 c8eda7bbdcab
equal deleted inserted replaced
17004:a1d86396d8c1 17005:50f434510da6
   102   6: 'E' branch2
   102   6: 'E' branch2
   103   4: 'C' branch2
   103   4: 'C' branch2
   104   2: 'B' branch1
   104   2: 'B' branch1
   105   0: 'A' 
   105   0: 'A' 
   106 
   106 
   107   $ hg rebase --detach -s 5 -d 8
   107   $ hg rebase -s 5 -d 8
   108   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
   108   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
   109 
   109 
   110   $ hg branches
   110   $ hg branches
   111   branch3                        8:466cdfb14b62
   111   branch3                        8:466cdfb14b62
   112   branch2                        4:e4fdb121d036
   112   branch2                        4:e4fdb121d036
   163   | |
   163   | |
   164   | o  1: 'branch1' branch1
   164   | o  1: 'branch1' branch1
   165   |/
   165   |/
   166   o  0: 'A'
   166   o  0: 'A'
   167   
   167   
   168   $ hg rebase --detach -s 8 -d 6
   168   $ hg rebase -s 8 -d 6
   169   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
   169   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
   170 
   170 
   171   $ hg branches
   171   $ hg branches
   172   branch2                        8:6b4bdc1b5ac0
   172   branch2                        8:6b4bdc1b5ac0
   173   branch3                        7:653b9feb4616
   173   branch3                        7:653b9feb4616
   227   | |
   227   | |
   228   | o  1: 'branch1' branch1
   228   | o  1: 'branch1' branch1
   229   |/
   229   |/
   230   o  0: 'A'
   230   o  0: 'A'
   231   
   231   
   232   $ hg rebase --detach -s 7 -d 6
   232   $ hg rebase -s 7 -d 6
   233   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
   233   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
   234 
   234 
   235   $ hg branches
   235   $ hg branches
   236   branch2                        7:6b4bdc1b5ac0
   236   branch2                        7:6b4bdc1b5ac0
   237   branch1                        2:0a03079c47fd (inactive)
   237   branch1                        2:0a03079c47fd (inactive)