equal
deleted
inserted
replaced
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 searching for copies back to rev 1 |
|
5 unmatched files in local: |
|
6 bar |
|
7 resolving manifests |
|
8 overwrite None partial False |
|
9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
|
10 foo: remote is newer -> g |
|
11 updating: foo 1/1 files (100.00%) |
|
12 getting foo |
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 (branch merge, don't forget to commit) |
|
15 n 0 -2 unset foo |
|
16 M foo |
|
17 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo |
|
18 rev offset length base linkrev nodeid p1 p2 |
|
19 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
20 1 5 9 1 1 6f4310b00b9a 2ed2a3912a0b 000000000000 |
|
21 2 14 5 2 2 c6fc755d7e68 6f4310b00b9a 000000000000 |
|