Mercurial > hg
comparison hgext/largefiles/lfcommands.py @ 18729:4e53ac3f466a stable
largefiles: updatelfiles should use working dir standins, not standins from p1
This makes a difference when working directory is dirty, especially when
merging with a revision for which we don't have largefiles.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 28 Feb 2013 13:45:18 +0100 |
parents | 1e636f7b1cfe |
children | c2d079387b2c |
comparison
equal
deleted
inserted
replaced
18728:1e636f7b1cfe | 18729:4e53ac3f466a |
---|---|
448 | 448 |
449 printed = False | 449 printed = False |
450 if printmessage and lfiles: | 450 if printmessage and lfiles: |
451 ui.status(_('getting changed largefiles\n')) | 451 ui.status(_('getting changed largefiles\n')) |
452 printed = True | 452 printed = True |
453 cachelfiles(ui, repo, '.', lfiles) | 453 cachelfiles(ui, repo, None, lfiles) |
454 | 454 |
455 updated, removed = 0, 0 | 455 updated, removed = 0, 0 |
456 for f in lfiles: | 456 for f in lfiles: |
457 i = _updatelfile(repo, lfdirstate, f) | 457 i = _updatelfile(repo, lfdirstate, f) |
458 if i: | 458 if i: |