Mercurial > hg

view tests/test-issue522.out @ 11172:e9226eb3af2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 1.5.3
author Matt Mackall <mpm@selenic.com>
date Thu, 13 May 2010 11:33:11 -0500
parents ba5e508b5e92
children db426935fa94
line wrap: on
line source

reverting foo
changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in local:
   bar
resolving manifests
 overwrite None partial False
 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
 foo: remote is newer -> g
update: foo 1/1 files (100.00%)
getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 unset               foo
M foo
c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
     2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000