Show More
@@ -1179,12 +1179,10 b' class queue(object):' | |||
|
1179 | 1179 | raise util.Abort(_("deletions found between repo revs")) |
|
1180 | 1180 | for f in a: |
|
1181 | 1181 | try: |
|
1182 |
|
|
|
1182 | util.unlink(repo.wjoin(f)) | |
|
1183 | 1183 | except OSError, e: |
|
1184 | 1184 | if e.errno != errno.ENOENT: |
|
1185 | 1185 | raise |
|
1186 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
|
1187 | except: pass | |
|
1188 | 1186 | repo.dirstate.forget(f) |
|
1189 | 1187 | for f in m: |
|
1190 | 1188 | getfile(f, mmap[f], mmap.flags(f)) |
General Comments 0
You need to be logged in to leave comments.
Login now