Mercurial > hg

comparison tests/test-merge-types.t @ 22707:38e0363dcbe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: switch the default name for internal tools from internal:x to :x
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:28 +0200
parents 7a9cbb315d84
children bd625cd4e5e7
comparison
equal deleted inserted replaced
22706:ad25986c4cd3 22707:38e0363dcbe0
38 a: versions differ -> m 38 a: versions differ -> m
39 updating: a 1/1 files (100.00%) 39 updating: a 1/1 files (100.00%)
40 picked tool 'internal:merge' for a (binary False symlink True) 40 picked tool 'internal:merge' for a (binary False symlink True)
41 merging a 41 merging a
42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da 42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
43 warning: internal:merge cannot merge symlinks for a 43 warning: internal :merge cannot merge symlinks for a
44 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 44 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
45 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 45 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
47 [1] 47 [1]
48 48
72 a: versions differ -> m 72 a: versions differ -> m
73 updating: a 1/1 files (100.00%) 73 updating: a 1/1 files (100.00%)
74 picked tool 'internal:merge' for a (binary False symlink True) 74 picked tool 'internal:merge' for a (binary False symlink True)
75 merging a 75 merging a
76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da 76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
77 warning: internal:merge cannot merge symlinks for a 77 warning: internal :merge cannot merge symlinks for a
78 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 78 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
79 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 79 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
80 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 80 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
81 [1] 81 [1]
82 82
104 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f 104 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
105 preserving a for resolve of a 105 preserving a for resolve of a
106 a: versions differ -> m 106 a: versions differ -> m
107 updating: a 1/1 files (100.00%) 107 updating: a 1/1 files (100.00%)
108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) 108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
109 picked tool 'internal:prompt' for a (binary False symlink True) 109 picked tool ':prompt' for a (binary False symlink True)
110 no tool found to merge a 110 no tool found to merge a
111 keep (l)ocal or take (o)ther? l 111 keep (l)ocal or take (o)ther? l
112 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 112 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
113 $ hg diff --git 113 $ hg diff --git
114 diff --git a/a b/a 114 diff --git a/a b/a
136 $ rm f 136 $ rm f
137 $ ln -s base f 137 $ ln -s base f
138 $ hg ci -qm2 138 $ hg ci -qm2
139 $ hg merge 139 $ hg merge
140 merging f 140 merging f
141 warning: internal:merge cannot merge symlinks for f 141 warning: internal :merge cannot merge symlinks for f
142 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 142 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
143 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 143 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
144 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 144 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
145 [1] 145 [1]
146 $ tellmeabout f 146 $ tellmeabout f
148 f -> base 148 f -> base
149 149
150 $ hg up -Cqr1 150 $ hg up -Cqr1
151 $ hg merge 151 $ hg merge
152 merging f 152 merging f
153 warning: internal:merge cannot merge symlinks for f 153 warning: internal :merge cannot merge symlinks for f
154 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 154 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
155 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 155 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
156 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 156 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
157 [1] 157 [1]
158 $ tellmeabout f 158 $ tellmeabout f
175 $ rm f 175 $ rm f
176 $ ln -s dangling f 176 $ ln -s dangling f
177 $ hg ci -qm2 177 $ hg ci -qm2
178 $ hg merge 178 $ hg merge
179 merging f 179 merging f
180 warning: internal:merge cannot merge symlinks for f 180 warning: internal :merge cannot merge symlinks for f
181 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 181 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
182 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 182 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
183 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 183 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
184 [1] 184 [1]
185 $ tellmeabout f 185 $ tellmeabout f
187 f -> dangling 187 f -> dangling
188 188
189 $ hg up -Cqr1 189 $ hg up -Cqr1
190 $ hg merge 190 $ hg merge
191 merging f 191 merging f
192 warning: internal:merge cannot merge symlinks for f 192 warning: internal :merge cannot merge symlinks for f
193 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 193 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
194 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 194 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
195 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 195 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
196 [1] 196 [1]
197 $ tellmeabout f 197 $ tellmeabout f
269 merging b 269 merging b
270 warning: conflicts during merge. 270 warning: conflicts during merge.
271 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') 271 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
272 warning: cannot merge flags for c 272 warning: cannot merge flags for c
273 merging d 273 merging d
274 warning: internal:merge cannot merge symlinks for d 274 warning: internal :merge cannot merge symlinks for d
275 merging d incomplete! (edit conflicts, then use 'hg resolve --mark') 275 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
276 merging f 276 merging f
277 warning: internal:merge cannot merge symlinks for f 277 warning: internal :merge cannot merge symlinks for f
278 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 278 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
279 merging h 279 merging h
280 warning: internal:merge cannot merge symlinks for h 280 warning: internal :merge cannot merge symlinks for h
281 merging h incomplete! (edit conflicts, then use 'hg resolve --mark') 281 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
282 3 files updated, 0 files merged, 0 files removed, 5 files unresolved 282 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
283 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 283 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
284 [1] 284 [1]
285 $ hg resolve -l 285 $ hg resolve -l
330 merging b 330 merging b
331 warning: conflicts during merge. 331 warning: conflicts during merge.
332 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') 332 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
333 warning: cannot merge flags for c 333 warning: cannot merge flags for c
334 merging d 334 merging d
335 warning: internal:merge cannot merge symlinks for d 335 warning: internal :merge cannot merge symlinks for d
336 merging d incomplete! (edit conflicts, then use 'hg resolve --mark') 336 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
337 merging f 337 merging f
338 warning: internal:merge cannot merge symlinks for f 338 warning: internal :merge cannot merge symlinks for f
339 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 339 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
340 merging h 340 merging h
341 warning: internal:merge cannot merge symlinks for h 341 warning: internal :merge cannot merge symlinks for h
342 merging h incomplete! (edit conflicts, then use 'hg resolve --mark') 342 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
343 3 files updated, 0 files merged, 0 files removed, 5 files unresolved 343 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
345 [1] 345 [1]
346 $ tellmeabout a 346 $ tellmeabout a