tests/test-evolve-progress.t
changeset 4598 2c094d4ee9cd
parent 4596 78d60913ea9f
child 4599 93ffedae6ec6
equal deleted inserted replaced
4597:f3236cd49ab8 4598:2c094d4ee9cd
    76   committing manifest
    76   committing manifest
    77   committing changelog
    77   committing changelog
    78   updating the branch cache
    78   updating the branch cache
    79   obscache is out of date
    79   obscache is out of date
    80   invalid branchheads cache (served): tip differs
    80   invalid branchheads cache (served): tip differs
    81   evolve: 4/3 changesets (133.33%)
       
    82   resolving manifests
    81   resolving manifests
    83    branchmerge: False, force: False, partial: False
    82    branchmerge: False, force: False, partial: False
    84    ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834
    83    ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834
    85    b: other deleted -> r
    84    b: other deleted -> r
    86   removing b
    85   removing b
   110   a
   109   a
   111   committing manifest
   110   committing manifest
   112   committing changelog
   111   committing changelog
   113   updating the branch cache
   112   updating the branch cache
   114   obscache is out of date
   113   obscache is out of date
   115   evolve: 2/1 changesets (200.00%)
       
   116   resolving manifests
   114   resolving manifests
   117    branchmerge: False, force: False, partial: False
   115    branchmerge: False, force: False, partial: False
   118    ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b
   116    ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b
   119    a: remote is newer -> g
   117    a: remote is newer -> g
   120   getting a
   118   getting a