Show More
@@ -3,7 +3,6 b'' | |||
|
3 | 3 | This file focuses mainly on updating largefiles in the working |
|
4 | 4 | directory (and ".hg/largefiles/dirstate") |
|
5 | 5 | |
|
6 | $ unset HGMERGE | |
|
7 | 6 | $ cat >> $HGRCPATH <<EOF |
|
8 | 7 | > [ui] |
|
9 | 8 | > merge = internal:merge |
@@ -124,7 +124,7 b' add some changesets to rename/remove/mer' | |||
|
124 | 124 | created new head |
|
125 | 125 | $ hg rm large normal3 |
|
126 | 126 | $ hg commit -q -m"remove large, normal3" |
|
127 | $ HGMERGE= hg merge --config ui.merge=internal:merge | |
|
127 | $ hg merge | |
|
128 | 128 | tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary |
|
129 | 129 | no tool found to merge stuff/maybelarge.dat |
|
130 | 130 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u |
@@ -1,10 +1,5 b'' | |||
|
1 | 1 | #require symlink execbit |
|
2 | 2 | |
|
3 | $ unset HGMERGE | |
|
4 | $ cat >> $HGRCPATH << EOF | |
|
5 | > [ui] | |
|
6 | > merge=:merge | |
|
7 | > EOF | |
|
8 | 3 | $ tellmeabout() { |
|
9 | 4 | > if [ -h $1 ]; then |
|
10 | 5 | > echo $1 is a symlink: |
@@ -41,7 +36,7 b' Symlink is local parent, executable is o' | |||
|
41 | 36 | ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
|
42 | 37 | preserving a for resolve of a |
|
43 | 38 | a: versions differ -> m (premerge) |
|
44 | tool :merge (for pattern a) can't handle symlinks | |
|
39 | tool internal:merge (for pattern a) can't handle symlinks | |
|
45 | 40 | couldn't find merge tool hgmerge |
|
46 | 41 | no tool found to merge a |
|
47 | 42 | picked tool ':prompt' for a (binary False symlink True changedelete False) |
@@ -212,7 +207,7 b' where that was what happened.' | |||
|
212 | 207 | $ ln -s base f |
|
213 | 208 | $ hg ci -qm2 |
|
214 | 209 | $ hg merge |
|
215 | tool :merge (for pattern f) can't handle symlinks | |
|
210 | tool internal:merge (for pattern f) can't handle symlinks | |
|
216 | 211 | no tool found to merge f |
|
217 | 212 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
218 | 213 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
@@ -224,7 +219,7 b' where that was what happened.' | |||
|
224 | 219 | |
|
225 | 220 | $ hg up -Cqr1 |
|
226 | 221 | $ hg merge |
|
227 | tool :merge (for pattern f) can't handle symlinks | |
|
222 | tool internal:merge (for pattern f) can't handle symlinks | |
|
228 | 223 | no tool found to merge f |
|
229 | 224 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
230 | 225 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
@@ -251,7 +246,7 b" Test removed 'x' flag merged with change" | |||
|
251 | 246 | $ ln -s dangling f |
|
252 | 247 | $ hg ci -qm2 |
|
253 | 248 | $ hg merge |
|
254 | tool :merge (for pattern f) can't handle symlinks | |
|
249 | tool internal:merge (for pattern f) can't handle symlinks | |
|
255 | 250 | no tool found to merge f |
|
256 | 251 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
257 | 252 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
@@ -263,7 +258,7 b" Test removed 'x' flag merged with change" | |||
|
263 | 258 | |
|
264 | 259 | $ hg up -Cqr1 |
|
265 | 260 | $ hg merge |
|
266 | tool :merge (for pattern f) can't handle symlinks | |
|
261 | tool internal:merge (for pattern f) can't handle symlinks | |
|
267 | 262 | no tool found to merge f |
|
268 | 263 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
269 | 264 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
@@ -346,13 +341,13 b' h: l vs l, different' | |||
|
346 | 341 | merging b |
|
347 | 342 | merging bx |
|
348 | 343 | warning: cannot merge flags for c without common ancestor - keeping local flags |
|
349 | tool :merge (for pattern d) can't handle symlinks | |
|
344 | tool internal:merge (for pattern d) can't handle symlinks | |
|
350 | 345 | no tool found to merge d |
|
351 | 346 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
|
352 | tool :merge (for pattern f) can't handle symlinks | |
|
347 | tool internal:merge (for pattern f) can't handle symlinks | |
|
353 | 348 | no tool found to merge f |
|
354 | 349 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
355 | tool :merge (for pattern h) can't handle symlinks | |
|
350 | tool internal:merge (for pattern h) can't handle symlinks | |
|
356 | 351 | no tool found to merge h |
|
357 | 352 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
|
358 | 353 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
@@ -408,13 +403,13 b' h: l vs l, different' | |||
|
408 | 403 | merging b |
|
409 | 404 | merging bx |
|
410 | 405 | warning: cannot merge flags for c without common ancestor - keeping local flags |
|
411 | tool :merge (for pattern d) can't handle symlinks | |
|
406 | tool internal:merge (for pattern d) can't handle symlinks | |
|
412 | 407 | no tool found to merge d |
|
413 | 408 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
|
414 | tool :merge (for pattern f) can't handle symlinks | |
|
409 | tool internal:merge (for pattern f) can't handle symlinks | |
|
415 | 410 | no tool found to merge f |
|
416 | 411 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
417 | tool :merge (for pattern h) can't handle symlinks | |
|
412 | tool internal:merge (for pattern h) can't handle symlinks | |
|
418 | 413 | no tool found to merge h |
|
419 | 414 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
|
420 | 415 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
General Comments 0
You need to be logged in to leave comments.
Login now