equal
deleted
inserted
replaced
260 |
260 |
261 Ancestor: normal Parent: normal-same Parent: large result: large |
261 Ancestor: normal Parent: normal-same Parent: large result: large |
262 |
262 |
263 $ hg up -Cqr normal-same |
263 $ hg up -Cqr normal-same |
264 $ hg merge -r large |
264 $ hg merge -r large |
265 local changed f which remote deleted |
|
266 use (c)hanged version or (d)elete? c |
|
267 getting changed largefiles |
265 getting changed largefiles |
268 1 largefiles updated, 0 removed |
266 1 largefiles updated, 0 removed |
269 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
267 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
270 (branch merge, don't forget to commit) |
268 (branch merge, don't forget to commit) |
271 $ cat f |
269 $ cat f |
273 |
271 |
274 swap |
272 swap |
275 |
273 |
276 $ hg up -Cqr large |
274 $ hg up -Cqr large |
277 $ hg merge -r normal-same |
275 $ hg merge -r normal-same |
278 remote changed f which local deleted |
276 getting changed largefiles |
279 use (c)hanged version or leave (d)eleted? c |
277 0 largefiles updated, 0 removed |
280 getting changed largefiles |
278 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 1 largefiles updated, 0 removed |
|
282 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
283 (branch merge, don't forget to commit) |
279 (branch merge, don't forget to commit) |
284 $ cat f |
280 $ cat f |
285 large |
281 large |
286 |
282 |
287 Ancestor: normal Parent: normal2 Parent: large result: ? |
283 Ancestor: normal Parent: normal2 Parent: large result: ? |
385 |
381 |
386 Ancestor: large Parent: large-same Parent: normal result: normal |
382 Ancestor: large Parent: large-same Parent: normal result: normal |
387 |
383 |
388 $ hg up -Cqr large-same |
384 $ hg up -Cqr large-same |
389 $ hg merge -r normal |
385 $ hg merge -r normal |
390 local changed .hglf/f which remote deleted |
|
391 use (c)hanged version or (d)elete? c |
|
392 getting changed largefiles |
386 getting changed largefiles |
393 0 largefiles updated, 0 removed |
387 0 largefiles updated, 0 removed |
394 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
388 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
395 (branch merge, don't forget to commit) |
389 (branch merge, don't forget to commit) |
396 $ cat f |
390 $ cat f |
398 |
392 |
399 swap |
393 swap |
400 |
394 |
401 $ hg up -Cqr normal |
395 $ hg up -Cqr normal |
402 $ hg merge -r large-same |
396 $ hg merge -r large-same |
403 remote changed .hglf/f which local deleted |
397 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
404 use (c)hanged version or leave (d)eleted? c |
|
405 getting changed largefiles |
|
406 0 largefiles updated, 0 removed |
|
407 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
408 (branch merge, don't forget to commit) |
398 (branch merge, don't forget to commit) |
409 $ cat f |
399 $ cat f |
410 normal |
400 normal |
411 |
401 |
412 Ancestor: large Parent: large2 Parent: normal result: ? |
402 Ancestor: large Parent: large2 Parent: normal result: ? |