Mercurial > hg
annotate tests/test-rename-merge2.out @ 6328:991f7518c3f3
tests: remove some unnecessary sleeps
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 Mar 2008 14:14:15 -0500 |
parents | 5af5f0f9d724 |
children | 4b0c9c674707 |
rev | line source |
---|---|
3252 | 1 -------------- |
2 test L:up a R:nc a b W: - 1 get local a to b | |
3 -------------- | |
4 resolving manifests | |
3314 | 5 overwrite None partial False |
6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
7 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
8 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
9 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
10 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
11 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
12 checking for directory renames |
3252 | 13 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
14 a: remote copied to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
15 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
16 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
17 merging a and b |
3314 | 18 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
19 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
20 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 21 merging rev |
3314 | 22 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 23 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
24 (branch merge, don't forget to commit) | |
25 -------------- | |
26 M b | |
27 a | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
28 C a |
3252 | 29 -------------- |
30 | |
31 -------------- | |
32 test L:nc a b R:up a W: - 2 get rem change to a and b | |
33 -------------- | |
34 resolving manifests | |
3314 | 35 overwrite None partial False |
36 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
37 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
38 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
39 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
40 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
41 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
42 checking for directory renames |
3252 | 43 a: remote is newer -> g |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
44 b: local copied to a -> m |
3252 | 45 rev: versions differ -> m |
46 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
47 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
48 merging b and a |
3314 | 49 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
50 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
51 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 52 merging rev |
3314 | 53 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 54 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
55 (branch merge, don't forget to commit) | |
56 -------------- | |
57 M a | |
58 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
59 a |
3252 | 60 -------------- |
61 | |
62 -------------- | |
63 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
64 -------------- | |
65 resolving manifests | |
3314 | 66 overwrite None partial False |
67 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
68 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
69 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
70 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
71 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
72 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
73 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
74 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
75 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
76 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
77 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
78 merging a and b |
3314 | 79 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
80 premerge successful |
3252 | 81 removing a |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
82 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 83 merging rev |
3314 | 84 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
86 (branch merge, don't forget to commit) | |
87 -------------- | |
88 M b | |
89 a | |
90 -------------- | |
91 | |
92 -------------- | |
93 test L:nm a b R:up a W: - 4 get remote change to b | |
94 -------------- | |
95 resolving manifests | |
3314 | 96 overwrite None partial False |
97 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
98 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
99 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
100 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
101 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
102 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
103 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
104 b: local moved to a -> m |
3252 | 105 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
106 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
107 merging b and a |
3314 | 108 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
109 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
110 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 111 merging rev |
3314 | 112 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) | |
115 -------------- | |
116 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
117 a |
3252 | 118 -------------- |
119 | |
120 -------------- | |
121 test L: R:nc a b W: - 5 get b | |
122 -------------- | |
123 resolving manifests | |
3314 | 124 overwrite None partial False |
125 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
126 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
127 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
128 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
129 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
130 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
131 checking for directory renames |
3252 | 132 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
133 b: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
134 getting b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
135 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 136 merging rev |
3314 | 137 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
138 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 139 (branch merge, don't forget to commit) |
140 -------------- | |
141 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
142 C a |
3252 | 143 -------------- |
144 | |
145 -------------- | |
146 test L:nc a b R: W: - 6 nothing | |
147 -------------- | |
148 resolving manifests | |
3314 | 149 overwrite None partial False |
150 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
151 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
152 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
153 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
154 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
155 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
156 checking for directory renames |
3252 | 157 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
158 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 159 merging rev |
3314 | 160 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
161 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 162 (branch merge, don't forget to commit) |
163 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
164 C a |
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
165 C b |
3252 | 166 -------------- |
167 | |
168 -------------- | |
169 test L: R:nm a b W: - 7 get b | |
170 -------------- | |
171 resolving manifests | |
3314 | 172 overwrite None partial False |
173 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
174 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
175 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
176 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
177 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
178 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
179 checking for directory renames |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
180 a: other deleted -> r |
3252 | 181 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
182 b: remote created -> g |
3252 | 183 removing a |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
184 getting b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
185 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 186 merging rev |
3314 | 187 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
188 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
3252 | 189 (branch merge, don't forget to commit) |
190 -------------- | |
191 M b | |
192 -------------- | |
193 | |
194 -------------- | |
195 test L:nm a b R: W: - 8 nothing | |
196 -------------- | |
197 resolving manifests | |
3314 | 198 overwrite None partial False |
199 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
200 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
201 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
202 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
203 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
204 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
205 checking for directory renames |
3252 | 206 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
207 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 208 merging rev |
3314 | 209 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
210 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 211 (branch merge, don't forget to commit) |
212 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
213 C b |
3252 | 214 -------------- |
215 | |
216 -------------- | |
217 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
218 -------------- | |
219 resolving manifests | |
3314 | 220 overwrite None partial False |
221 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
222 searching for copies back to rev 1 |
3252 | 223 b: versions differ -> m |
224 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
225 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 226 merging b |
3314 | 227 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
228 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 229 merging rev |
3314 | 230 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 231 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
232 (branch merge, don't forget to commit) | |
233 -------------- | |
234 M b | |
235 -------------- | |
236 | |
237 -------------- | |
238 test L:nm a b R:nm a c W: - 11 get c, keep b | |
239 -------------- | |
240 resolving manifests | |
3314 | 241 overwrite None partial False |
242 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
243 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
244 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
245 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
246 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
247 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
248 all copies found (* = to merge, ! = divergent): |
5857
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
249 c -> a ! |
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
250 b -> a ! |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
251 checking for directory renames |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
252 a: divergent renames -> dr |
3252 | 253 rev: versions differ -> m |
254 c: remote created -> g | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
255 warning: detected divergent renames of a to: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
256 b |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
257 c |
3252 | 258 getting c |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
259 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 260 merging rev |
3314 | 261 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
3252 | 262 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
263 (branch merge, don't forget to commit) | |
264 -------------- | |
265 M c | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
266 C b |
3252 | 267 -------------- |
268 | |
269 -------------- | |
270 test L:nc a b R:up b W: - 12 merge b no ancestor | |
271 -------------- | |
272 resolving manifests | |
3314 | 273 overwrite None partial False |
274 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
275 searching for copies back to rev 1 |
3252 | 276 b: versions differ -> m |
277 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
278 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 279 merging b |
3314 | 280 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
281 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 282 merging rev |
3314 | 283 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
3252 | 284 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
285 (branch merge, don't forget to commit) | |
286 -------------- | |
287 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
288 C a |
3252 | 289 -------------- |
290 | |
291 -------------- | |
292 test L:up b R:nm a b W: - 13 merge b no ancestor | |
293 -------------- | |
294 resolving manifests | |
3314 | 295 overwrite None partial False |
296 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
297 searching for copies back to rev 1 |
3252 | 298 a: other deleted -> r |
299 b: versions differ -> m | |
300 rev: versions differ -> m | |
301 removing a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
302 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 303 merging b |
3314 | 304 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
305 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 306 merging rev |
3314 | 307 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 308 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
309 (branch merge, don't forget to commit) | |
310 -------------- | |
311 M b | |
312 -------------- | |
313 | |
314 -------------- | |
315 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
316 -------------- | |
317 resolving manifests | |
3314 | 318 overwrite None partial False |
319 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
320 searching for copies back to rev 1 |
3252 | 321 a: remote is newer -> g |
322 b: versions differ -> m | |
323 rev: versions differ -> m | |
324 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
325 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 326 merging b |
3314 | 327 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
328 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 329 merging rev |
3314 | 330 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 331 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
332 (branch merge, don't forget to commit) | |
333 -------------- | |
334 M a | |
335 M b | |
336 -------------- | |
337 | |
338 -------------- | |
339 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
340 -------------- | |
341 resolving manifests | |
3314 | 342 overwrite None partial False |
343 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
344 searching for copies back to rev 1 |
3252 | 345 a: other deleted -> r |
346 b: versions differ -> m | |
347 rev: versions differ -> m | |
348 removing a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
349 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 350 merging b |
3314 | 351 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
352 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 353 merging rev |
3314 | 354 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 355 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
356 (branch merge, don't forget to commit) | |
357 -------------- | |
358 M b | |
359 -------------- | |
360 | |
361 -------------- | |
3281 | 362 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3252 | 363 -------------- |
364 resolving manifests | |
3314 | 365 overwrite None partial False |
366 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
367 searching for copies back to rev 1 |
3252 | 368 a: remote is newer -> g |
369 b: versions differ -> m | |
370 rev: versions differ -> m | |
371 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
372 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 373 merging b |
3314 | 374 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
375 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 376 merging rev |
3314 | 377 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 378 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
379 (branch merge, don't forget to commit) | |
380 -------------- | |
381 M a | |
382 M b | |
383 -------------- | |
384 | |
385 -------------- | |
3281 | 386 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3252 | 387 -------------- |
388 resolving manifests | |
3314 | 389 overwrite None partial False |
390 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
391 searching for copies back to rev 1 |
3252 | 392 b: versions differ -> m |
393 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
394 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 395 merging b |
3314 | 396 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
397 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 398 merging rev |
3314 | 399 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
3252 | 400 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
401 (branch merge, don't forget to commit) | |
402 -------------- | |
403 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
404 C a |
3252 | 405 -------------- |
406 | |
407 -------------- | |
408 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
409 -------------- | |
410 resolving manifests | |
3314 | 411 overwrite None partial False |
412 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
413 searching for copies back to rev 1 |
3252 | 414 b: versions differ -> m |
415 rev: versions differ -> m | |
416 a: prompt recreating -> g | |
417 getting a | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
418 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 419 merging b |
3314 | 420 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
421 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 422 merging rev |
3314 | 423 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 424 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
425 (branch merge, don't forget to commit) | |
426 -------------- | |
427 M a | |
428 M b | |
429 -------------- | |
430 | |
431 -------------- | |
3281 | 432 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3252 | 433 -------------- |
434 resolving manifests | |
3314 | 435 overwrite None partial False |
436 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
437 searching for copies back to rev 1 |
3252 | 438 b: versions differ -> m |
439 rev: versions differ -> m | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
440 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 441 merging b |
3314 | 442 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
443 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 444 merging rev |
3314 | 445 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
3252 | 446 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
447 (branch merge, don't forget to commit) | |
448 -------------- | |
449 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
450 C a |
3252 | 451 -------------- |
452 | |
453 -------------- | |
454 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
455 -------------- | |
456 resolving manifests | |
3314 | 457 overwrite None partial False |
458 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
459 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
460 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
461 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
462 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
463 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
464 checking for directory renames |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
465 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
466 a: remote moved to b -> m |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4674
diff
changeset
|
467 copying a to b |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
468 picked tool 'python ../merge' for a (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
469 merging a and b |
3314 | 470 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
3252 | 471 removing a |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
472 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 473 merging rev |
3314 | 474 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
3252 | 475 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
476 (branch merge, don't forget to commit) | |
477 -------------- | |
478 M b | |
479 a | |
480 -------------- | |
481 | |
482 -------------- | |
483 test L:um a b R:up a W: - 21 merge a and b to b | |
484 -------------- | |
485 resolving manifests | |
3314 | 486 overwrite None partial False |
487 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
488 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
489 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
490 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
491 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
492 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
493 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
494 b: local moved to a -> m |
3252 | 495 rev: versions differ -> m |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
496 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
497 merging b and a |
3314 | 498 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
499 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 500 merging rev |
3314 | 501 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 502 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
503 (branch merge, don't forget to commit) | |
504 -------------- | |
505 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
506 a |
3252 | 507 -------------- |
508 | |
509 -------------- | |
510 test L:nm a b R:up a c W: - 23 get c, keep b | |
511 -------------- | |
512 resolving manifests | |
3314 | 513 overwrite None partial False |
514 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
515 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
516 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
517 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
518 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
519 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
520 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
521 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
522 checking for directory renames |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
523 b: local moved to a -> m |
3252 | 524 rev: versions differ -> m |
525 c: remote created -> g | |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
526 picked tool 'python ../merge' for b (binary False symlink False) |
3311
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3308
diff
changeset
|
527 merging b and a |
3314 | 528 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
529 premerge successful |
3252 | 530 getting c |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
531 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 532 merging rev |
3314 | 533 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
3252 | 534 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
535 (branch merge, don't forget to commit) | |
536 -------------- | |
537 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
538 a |
3252 | 539 M c |
540 -------------- | |
541 |