Mercurial > hg
diff hgext/convert/git.py @ 25998:a7527c5769bb
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 10 Aug 2015 15:30:28 -0500 |
parents | 80149d0b6842 d4e1e947444b |
children | e63d05fbae84 |
line wrap: on
line diff
--- a/hgext/convert/git.py Sat Aug 08 18:52:59 2015 -0700 +++ b/hgext/convert/git.py Mon Aug 10 15:30:28 2015 -0500 @@ -255,12 +255,18 @@ entry = l.split() continue f = l + if entry[4][0] == 'C': + copysrc = f + copydest = difftree[i] + i += 1 + f = copydest + copies[copydest] = copysrc if f not in seen: add(entry, f, False) # A file can be copied multiple times, or modified and copied # simultaneously. So f can be repeated even if fdest isn't. - if entry[4][0] in 'RC': - # rename or copy: next line is the destination + if entry[4][0] == 'R': + # rename: next line is the destination fdest = difftree[i] i += 1 if fdest not in seen: