Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 3701:05c8704a3743
handle git patches that rename a file to more than one destination
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 20 Nov 2006 19:32:45 -0200 |
parents | 562a65635bcb |
children | 70c3ee224c08 |
line wrap: on
line diff
--- a/mercurial/patch.py Mon Nov 20 19:32:43 2006 -0200 +++ b/mercurial/patch.py Mon Nov 20 19:32:45 2006 -0200 @@ -341,7 +341,7 @@ if not patches: return copies = [] - removes = [] + removes = {} cfiles = patches.keys() cwd = repo.getcwd() if cwd: @@ -350,16 +350,18 @@ ctype, gp = patches[f] if ctype == 'RENAME': copies.append((gp.oldpath, gp.path, gp.copymod)) - removes.append(gp.oldpath) + removes[gp.oldpath] = 1 elif ctype == 'COPY': copies.append((gp.oldpath, gp.path, gp.copymod)) elif ctype == 'DELETE': - removes.append(gp.path) + removes[gp.path] = 1 for src, dst, after in copies: if not after: copyfile(src, dst, repo.root) repo.copy(src, dst, wlock=wlock) + removes = removes.keys() if removes: + removes.sort() repo.remove(removes, True, wlock=wlock) for f in patches: ctype, gp = patches[f]