Mercurial Mercurial > mercurial / 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-update-reverse.t
changeset 25125 bd625cd4e5e7
parent 21391 cb15835456cb
child 44724 5c2a4f37eace
equal deleted inserted replaced
25124:d08a13215d1a 25125:bd625cd4e5e7 
    70    ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
 
    70    ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
 
    71    side1: other deleted -> r
 
    71    side1: other deleted -> r
 
    72   removing side1
 
    72   removing side1
 
    73    side2: other deleted -> r
 
    73    side2: other deleted -> r
 
    74   removing side2
 
    74   removing side2
 
    75   updating: side2 2/3 files (66.67%)
 
       
    76    main: remote created -> g
 
    75    main: remote created -> g
 
    77   getting main
 
    76   getting main
 
    78   updating: main 3/3 files (100.00%)
 
       
    79   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    77   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    80 
    78 
    81   $ ls
 
    79   $ ls
 
    82   a
 
    80   a
 
    83   main
 
    81   main
mercurial