Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-progress.t
changeset 5293 4da1d21231ae
parent 5151 e78926a1a473
child 5359 01bcd39c432c
equal deleted inserted replaced
5288:5cfec61b872b 5293:4da1d21231ae 
    31   resolving manifests
 
    31   resolving manifests
 
    32    branchmerge: True, force: True, partial: False
 
    32    branchmerge: True, force: True, partial: False
 
    33    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
 
    33    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
 
    34    a: remote is newer -> g
 
    34    a: remote is newer -> g
 
    35   getting a
 
    35   getting a
 
    36   updating: a 1/1 files (100.00%)
 
    36   updating: a 1/2 files (50.00%)
 
    37   committing files:
 
    37   committing files:
 
    38   a
 
    38   a
 
    39   committing manifest
 
    39   committing manifest
 
    40   committing changelog
 
    40   committing changelog
 
    41   evolve: 2/3 changesets (66.67%)
 
    41   evolve: 2/3 changesets (66.67%)
 
    59   resolving manifests
 
    59   resolving manifests
 
    60    branchmerge: True, force: True, partial: False
 
    60    branchmerge: True, force: True, partial: False
 
    61    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
 
    61    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
 
    62    b: remote is newer -> g
 
    62    b: remote is newer -> g
 
    63   getting b
 
    63   getting b
 
    64   updating: b 1/1 files (100.00%)
 
    64   updating: b 1/2 files (50.00%)
 
    65   committing files:
 
    65   committing files:
 
    66   b
 
    66   b
 
    67   committing manifest
 
    67   committing manifest
 
    68   committing changelog
 
    68   committing changelog
 
    69   updating the branch cache
 
    69   updating the branch cache
 
    92   resolving manifests
 
    92   resolving manifests
 
    93    branchmerge: True, force: True, partial: False
 
    93    branchmerge: True, force: True, partial: False
 
    94    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
 
    94    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
 
    95    a: remote is newer -> g
 
    95    a: remote is newer -> g
 
    96   getting a
 
    96   getting a
 
    97   updating: a 1/1 files (100.00%)
 
    97   updating: a 1/2 files (50.00%)
 
    98   committing files:
 
    98   committing files:
 
    99   a
 
    99   a
 
   100   committing manifest
 
   100   committing manifest
 
   101   committing changelog
 
   101   committing changelog
 
   102   updating the branch cache
 
   102   updating the branch cache
 
   168   resolving manifests
 
   168   resolving manifests
 
   169    branchmerge: True, force: True, partial: False
 
   169    branchmerge: True, force: True, partial: False
 
   170    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
 
   170    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
 
   171    b: remote is newer -> g
 
   171    b: remote is newer -> g
 
   172   getting b
 
   172   getting b
 
   173   updating: b 1/1 files (100.00%)
 
   173   updating: b 1/2 files (50.00%)
 
   174   committing files:
 
   174   committing files:
 
   175   b
 
   175   b
 
   176   committing manifest
 
   176   committing manifest
 
   177   committing changelog
 
   177   committing changelog
 
   178   updating the branch cache
 
   178   updating the branch cache
evolve