Mercurial > hg
diff hgext/largefiles/overrides.py @ 18731:c2d079387b2c
merge with stable
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 28 Feb 2013 14:51:59 +0100 |
parents | d69585a5c5c0 1e636f7b1cfe |
children | 1793251e75c8 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sat Feb 23 22:54:57 2013 +0100 +++ b/hgext/largefiles/overrides.py Thu Feb 28 14:51:59 2013 +0100 @@ -686,15 +686,8 @@ return result def hgmerge(orig, repo, node, force=None, remind=True): - # Mark the repo as being in the middle of a merge, so that - # updatelfiles() will know that it needs to trust the standins in - # the working copy, not in the standins in the current node - repo._ismerging = True - try: - result = orig(repo, node, force, remind) - lfcommands.updatelfiles(repo.ui, repo) - finally: - repo._ismerging = False + result = orig(repo, node, force, remind) + lfcommands.updatelfiles(repo.ui, repo) return result # When we rebase a repository with remotely changed largefiles, we need to @@ -751,7 +744,7 @@ if opts.get('all_largefiles'): revspostpull = len(repo) revs = [] - for rev in xrange(revsprepull + 1, revspostpull): + for rev in xrange(revsprepull, revspostpull): revs.append(repo[rev].rev()) lfcommands.downloadlfiles(ui, repo, revs) return result