tests/test-issue522.out
changeset 5210 90d9ec0dc69d
child 5371 17ed9b9a0d03
equal deleted inserted replaced
5209:bbdcdc7f170e 5210:90d9ec0dc69d
       
     1 reverting foo
       
     2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
       
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     4 resolving manifests
       
     5  overwrite None partial False
       
     6  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
       
     7  foo: remote is newer -> g
       
     8 getting foo
       
     9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    10 (branch merge, don't forget to commit)
       
    11 n   0         -2 unset             foo
       
    12 M foo
       
    13 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
       
    14    rev    offset  length   base linkrev nodeid       p1           p2
       
    15      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
       
    16      1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
       
    17      2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000