equal
deleted
inserted
replaced
41 |
41 |
42 $ hg --debug up |
42 $ hg --debug up |
43 resolving manifests |
43 resolving manifests |
44 branchmerge: False, force: False, partial: False |
44 branchmerge: False, force: False, partial: False |
45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
46 preserving a for resolve of a |
|
47 b: remote created -> g |
46 b: remote created -> g |
48 getting b |
47 getting b |
|
48 preserving a for resolve of a |
49 a: versions differ -> m (premerge) |
49 a: versions differ -> m (premerge) |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
51 merging a |
51 merging a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
53 a: versions differ -> m (merge) |
53 a: versions differ -> m (merge) |
66 $ hg --debug up 0 |
66 $ hg --debug up 0 |
67 starting 4 threads for background file closing (?) |
67 starting 4 threads for background file closing (?) |
68 resolving manifests |
68 resolving manifests |
69 branchmerge: False, force: False, partial: False |
69 branchmerge: False, force: False, partial: False |
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
71 preserving a for resolve of a |
|
72 b: other deleted -> r |
71 b: other deleted -> r |
73 removing b |
72 removing b |
|
73 preserving a for resolve of a |
74 starting 4 threads for background file closing (?) |
74 starting 4 threads for background file closing (?) |
75 a: versions differ -> m (premerge) |
75 a: versions differ -> m (premerge) |
76 picked tool 'true' for a (binary False symlink False changedelete False) |
76 picked tool 'true' for a (binary False symlink False changedelete False) |
77 merging a |
77 merging a |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
90 |
90 |
91 $ hg --debug up |
91 $ hg --debug up |
92 resolving manifests |
92 resolving manifests |
93 branchmerge: False, force: False, partial: False |
93 branchmerge: False, force: False, partial: False |
94 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
94 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
95 preserving a for resolve of a |
|
96 b: remote created -> g |
95 b: remote created -> g |
97 getting b |
96 getting b |
|
97 preserving a for resolve of a |
98 a: versions differ -> m (premerge) |
98 a: versions differ -> m (premerge) |
99 picked tool 'true' for a (binary False symlink False changedelete False) |
99 picked tool 'true' for a (binary False symlink False changedelete False) |
100 merging a |
100 merging a |
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
102 a: versions differ -> m (merge) |
102 a: versions differ -> m (merge) |