diff options
Diffstat (limited to 'tests/test-issue522.t')
| -rw-r--r-- | tests/test-issue522.t | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-issue522.t b/tests/test-issue522.t index a21f23b..a81cf95 100644 --- a/tests/test-issue522.t +++ b/tests/test-issue522.t @@ -29,8 +29,8 @@ revision. unmatched files in local: bar resolving manifests - overwrite: False, partial: False - ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee + overwrite None partial False + ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee foo: remote is newer -> g updating: foo 1/1 files (100.00%) getting foo @@ -49,8 +49,8 @@ revision. c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo $ hg debugindex foo - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re) - 1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re) - 2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re) + 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 |