Show More
@@ -374,10 +374,13 b' def overridemanifestmerge(origfn, repo, ' | |||
|
374 | 374 | f, m, args, msg = action |
|
375 | 375 | |
|
376 | 376 | choices = (_('&Largefile'), _('&Normal file')) |
|
377 | if m == "g" and lfutil.splitstandin(f) in p1 and f in p2: | |
|
377 | ||
|
378 | splitstandin = lfutil.splitstandin(f) | |
|
379 | if (m == "g" and splitstandin is not None and | |
|
380 | splitstandin in p1 and f in p2): | |
|
378 | 381 | # Case 1: normal file in the working copy, largefile in |
|
379 | 382 | # the second parent |
|
380 |
lfile = |
|
|
383 | lfile = splitstandin | |
|
381 | 384 | standin = f |
|
382 | 385 | msg = _('%s has been turned into a largefile\n' |
|
383 | 386 | 'use (l)argefile or keep as (n)ormal file?') % lfile |
General Comments 0
You need to be logged in to leave comments.
Login now