tests/test-branch-change.t
changeset 35771 ebb75443969a
parent 35746 e5b6ba786d83
child 40707 69268a13ffa5
equal deleted inserted replaced
35770:0aafeded7957 35771:ebb75443969a
    80 
    80 
    81 Without obsmarkers
    81 Without obsmarkers
    82 
    82 
    83   $ hg branch -r 3:4 foo --config experimental.evolution=!
    83   $ hg branch -r 3:4 foo --config experimental.evolution=!
    84   changed branch on 2 changesets
    84   changed branch on 2 changesets
    85   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg (glob)
    85   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg
    86   $ hg glog
    86   $ hg glog
    87   @  4:3938acfb5c0f Added e
    87   @  4:3938acfb5c0f Added e
    88   |  foo ()
    88   |  foo ()
    89   o  3:9435da006bdc Added d
    89   o  3:9435da006bdc Added d
    90   |  foo ()
    90   |  foo ()
   176   new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba
   176   new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba
   177   moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba
   177   moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba
   178   resolving manifests
   178   resolving manifests
   179    branchmerge: False, force: False, partial: False
   179    branchmerge: False, force: False, partial: False
   180    ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69
   180    ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69
       
   181   starting 4 threads for background file closing (?)
   181   changed branch on 2 changesets
   182   changed branch on 2 changesets
   182   updating the branch cache
   183   updating the branch cache
   183   invalid branchheads cache (served): tip differs
   184   invalid branchheads cache (served): tip differs
   184 
   185 
   185   $ hg glog -r '(.^)::'
   186   $ hg glog -r '(.^)::'