Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-up-local-change.out
changeset 3006 87a0332ab58b
parent 3002 a31557193f3c
child 3095 92a0c2200e41
equal deleted inserted replaced
3005:c67920d78248 3006:87a0332ab58b 
    17 resolving manifests
 
    17 resolving manifests
 
    18  overwrite False branchmerge False partial False linear True
 
    18  overwrite False branchmerge False partial False linear True
 
    19  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
 
    19  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
 
    20  a versions differ, resolve
 
    20  a versions differ, resolve
 
    21 remote created b
 
    21 remote created b
 
    22 getting b
 
       
    23 merging a
 
    22 merging a
 
    24 resolving a
 
    23 resolving a
 
    25 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 
    24 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 
       
    25 getting b
 
    26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    27 changeset:   1:802f095af299
 
    27 changeset:   1:802f095af299
 
    28 tag:         tip
 
    28 tag:         tip
 
    29 user:        test
 
    29 user:        test
 
    30 date:        Mon Jan 12 13:46:40 1970 +0000
 
    30 date:        Mon Jan 12 13:46:40 1970 +0000
 
    51 resolving manifests
 
    51 resolving manifests
 
    52  overwrite False branchmerge False partial False linear True
 
    52  overwrite False branchmerge False partial False linear True
 
    53  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
 
    53  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
 
    54  a versions differ, resolve
 
    54  a versions differ, resolve
 
    55 remote created b
 
    55 remote created b
 
    56 getting b
 
       
    57 merging a
 
    56 merging a
 
    58 resolving a
 
    57 resolving a
 
    59 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 
    58 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 
       
    59 getting b
 
    60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    61 changeset:   1:802f095af299
 
    61 changeset:   1:802f095af299
 
    62 tag:         tip
 
    62 tag:         tip
 
    63 user:        test
 
    63 user:        test
 
    64 date:        Mon Jan 12 13:46:40 1970 +0000
 
    64 date:        Mon Jan 12 13:46:40 1970 +0000
mercurial-crew-with-dirclash