tests/test-evolve-progress.t
branchmercurial-5.3
changeset 5360 457c4c6646d6
parent 5359 01bcd39c432c
child 5364 be5aa681c122
equal deleted inserted replaced
5359:01bcd39c432c 5360:457c4c6646d6
    40   committing changelog
    40   committing changelog
    41   evolve: 2/3 changesets (66.67%)
    41   evolve: 2/3 changesets (66.67%)
    42   move:[2] third
    42   move:[2] third
    43   hg rebase -r 769574b07a96 -d 5f16d91ecde0
    43   hg rebase -r 769574b07a96 -d 5f16d91ecde0
    44   evolve: 2/3 changesets (66.67%)
    44   evolve: 2/3 changesets (66.67%)
       
    45     unmatched files in other:
       
    46      b
    45   resolving manifests
    47   resolving manifests
    46    branchmerge: True, force: True, partial: False
    48    branchmerge: True, force: True, partial: False
    47    ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96
    49    ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96
    48    b: remote created -> g
    50    b: remote created -> g
    49   getting b
    51   getting b
   150   obscache is out of date
   152   obscache is out of date
   151   move:[6] third
   153   move:[6] third
   152   atop:[11] second
   154   atop:[11] second
   153   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   155   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   154   evolve: 2/3 changesets (66.67%)
   156   evolve: 2/3 changesets (66.67%)
       
   157     unmatched files in other:
       
   158      b
   155   resolving manifests
   159   resolving manifests
   156    branchmerge: True, force: True, partial: False
   160    branchmerge: True, force: True, partial: False
   157    ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0
   161    ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0
   158    b: remote created -> g
   162    b: remote created -> g
   159   getting b
   163   getting b