Mercurial > hgsubversion
comparison cmdutil.py @ 323:067914ecb4eb
push: Fix a bug in deletion of an entire tree.
This bug meant that if an entire subtree of the repo was
deleted and there were files at varying levels of the
hierarchy, then some of the files at higher levels
might escape deletion when the revision was pushed to svn.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Fri, 08 May 2009 16:26:33 -0500 |
| parents | b6a9cdee2f68 |
| children |
comparison
equal
deleted
inserted
replaced
| 322:05cd4a5138bf | 323:067914ecb4eb |
|---|---|
| 243 deleteddirs2 = list(deleteddirs) | 243 deleteddirs2 = list(deleteddirs) |
| 244 deleteddirs2.sort(reverse=True) | 244 deleteddirs2.sort(reverse=True) |
| 245 for d in deleteddirs2: | 245 for d in deleteddirs2: |
| 246 pos = d.rfind('/') | 246 pos = d.rfind('/') |
| 247 if pos >= 0 and d[:pos] in deleteddirs: | 247 if pos >= 0 and d[:pos] in deleteddirs: |
| 248 deleteddirs.remove(d[:pos]) | 248 deleteddirs.remove(d) |
| 249 | 249 |
| 250 newcopies = {} | 250 newcopies = {} |
| 251 for source, dest in copies.iteritems(): | 251 for source, dest in copies.iteritems(): |
| 252 newcopies[svnpath(source)] = (svnpath(dest), base_revision) | 252 newcopies[svnpath(source)] = (svnpath(dest), base_revision) |
| 253 | 253 |