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-issue522.out
changeset 5371 17ed9b9a0d03
parent 5210 90d9ec0dc69d
child 5405 8feb33c2d153
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03 
     2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 
     2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     4 resolving manifests
 
     4 resolving manifests
 
     5  overwrite None partial False
 
     5  overwrite None partial False
 
     6  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
 
     6  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
 
       
     7   searching for copies back to rev 1
 
       
     8   unmatched files in local:
 
       
     9    bar
 
     7  foo: remote is newer -> g
 
    10  foo: remote is newer -> g
 
     8 getting foo
 
    11 getting foo
 
     9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    10 (branch merge, don't forget to commit)
 
    13 (branch merge, don't forget to commit)
 
    11 n   0         -2 unset             foo
 
    14 n   0         -2 unset             foo
mercurial-crew-with-dirclash