Mercurial > hgsubversion
comparison cmdutil.py @ 329:235022089da6
merge with stable
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Sat, 09 May 2009 12:36:17 +0200 |
| parents | 067914ecb4eb |
| children |
comparison
equal
deleted
inserted
replaced
| 328:48ec2d62dc29 | 329:235022089da6 |
|---|---|
| 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 |