equal
deleted
inserted
replaced
38 user: test |
38 user: test |
39 date: Thu Jan 01 00:00:00 1970 +0000 |
39 date: Thu Jan 01 00:00:00 1970 +0000 |
40 summary: 1 |
40 summary: 1 |
41 |
41 |
42 $ hg --debug up |
42 $ hg --debug up |
43 searching for copies back to rev 1 |
|
44 unmatched files in other: |
43 unmatched files in other: |
45 b |
44 b |
46 resolving manifests |
45 resolving manifests |
47 branchmerge: False, force: False, partial: False |
46 branchmerge: False, force: False, partial: False |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
47 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
66 date: Thu Jan 01 00:00:00 1970 +0000 |
65 date: Thu Jan 01 00:00:00 1970 +0000 |
67 summary: 2 |
66 summary: 2 |
68 |
67 |
69 $ hg --debug up 0 |
68 $ hg --debug up 0 |
70 starting 4 threads for background file closing (?) |
69 starting 4 threads for background file closing (?) |
71 searching for copies back to rev 0 |
|
72 unmatched files in local (from topological common ancestor): |
70 unmatched files in local (from topological common ancestor): |
73 b |
71 b |
74 resolving manifests |
72 resolving manifests |
75 branchmerge: False, force: False, partial: False |
73 branchmerge: False, force: False, partial: False |
76 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
74 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
93 user: test |
91 user: test |
94 date: Thu Jan 01 00:00:00 1970 +0000 |
92 date: Thu Jan 01 00:00:00 1970 +0000 |
95 summary: 1 |
93 summary: 1 |
96 |
94 |
97 $ hg --debug up |
95 $ hg --debug up |
98 searching for copies back to rev 1 |
|
99 unmatched files in other: |
96 unmatched files in other: |
100 b |
97 b |
101 resolving manifests |
98 resolving manifests |
102 branchmerge: False, force: False, partial: False |
99 branchmerge: False, force: False, partial: False |
103 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
100 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |