Show More
@@ -437,7 +437,7 b' def downloadlfiles(ui, repo, rev=None):' | |||||
437 | return totalsuccess, totalmissing |
|
437 | return totalsuccess, totalmissing | |
438 |
|
438 | |||
439 | def updatelfiles(ui, repo, filelist=None, printmessage=None, |
|
439 | def updatelfiles(ui, repo, filelist=None, printmessage=None, | |
440 | normallookup=False): |
|
440 | normallookup=False, checked=False): | |
441 | '''Update largefiles according to standins in the working directory |
|
441 | '''Update largefiles according to standins in the working directory | |
442 |
|
442 | |||
443 | If ``printmessage`` is other than ``None``, it means "print (or |
|
443 | If ``printmessage`` is other than ``None``, it means "print (or | |
@@ -465,7 +465,8 b' def updatelfiles(ui, repo, filelist=None' | |||||
465 | util.unlinkpath(absstandin + '.orig') |
|
465 | util.unlinkpath(absstandin + '.orig') | |
466 | expecthash = lfutil.readstandin(repo, lfile) |
|
466 | expecthash = lfutil.readstandin(repo, lfile) | |
467 | if (expecthash != '' and |
|
467 | if (expecthash != '' and | |
468 |
( |
|
468 | (checked or | |
|
469 | not os.path.exists(abslfile) or | |||
469 | expecthash != lfutil.hashfile(abslfile))): |
|
470 | expecthash != lfutil.hashfile(abslfile))): | |
470 | if lfile not in repo[None]: # not switched to normal file |
|
471 | if lfile not in repo[None]: # not switched to normal file | |
471 | util.unlinkpath(abslfile, ignoremissing=True) |
|
472 | util.unlinkpath(abslfile, ignoremissing=True) |
@@ -1324,7 +1324,7 b' def mergeupdate(orig, repo, node, branch' | |||||
1324 | filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
|
1324 | filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | |
1325 |
|
1325 | |||
1326 | lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, |
|
1326 | lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, | |
1327 | normallookup=partial) |
|
1327 | normallookup=partial, checked=linearmerge) | |
1328 |
|
1328 | |||
1329 | return result |
|
1329 | return result | |
1330 | finally: |
|
1330 | finally: |
General Comments 0
You need to be logged in to leave comments.
Login now