Mercurial > public > mercurial-scm > hg-stable
diff hgext/largefiles/overrides.py @ 27655:af13eaf9ab8c
merge: add a new 'backup' argument to get actions
We're going to use this in an upcoming patch to back untracked files up when
they're replaced by tracked ones.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sat, 02 Jan 2016 03:02:57 -0800 |
| parents | 42910f9fffeb |
| children | 00bd72629a45 |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Sat Jan 02 03:02:57 2016 -0800 +++ b/hgext/largefiles/overrides.py Sat Jan 02 03:02:57 2016 -0800 @@ -483,7 +483,7 @@ if sm in ('g', 'dc') and lm != 'r': if sm == 'dc': f1, f2, fa, move, anc = sargs - sargs = (p2[f2].flags(),) + sargs = (p2[f2].flags(), False) # Case 1: normal file in the working copy, largefile in # the second parent usermsg = _('remote turned local normal file %s into a largefile\n' @@ -501,7 +501,7 @@ elif lm in ('g', 'dc') and sm != 'r': if lm == 'dc': f1, f2, fa, move, anc = largs - largs = (p2[f2].flags(),) + largs = (p2[f2].flags(), False) # Case 2: largefile in the working copy, normal file in # the second parent usermsg = _('remote turned local largefile %s into a normal file\n'