test-issue522.out
21 lines
| 913 B
| text/plain
|
TextLexer
/ tests / test-issue522.out
|
r5210 | reverting foo | ||
changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r8753 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
bar | ||||
|
r5210 | resolving manifests | ||
overwrite None partial False | ||||
ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee | ||||
foo: remote is newer -> g | ||||
|
r11716 | updating: foo 1/1 files (100.00%) | ||
|
r5210 | getting foo | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
|
r5858 | n 0 -2 unset foo | ||
|
r5210 | M foo | ||
|
r5405 | c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo | ||
|
r5210 | 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 | ||||