Show More
@@ -56,7 +56,7 def _collectbrokencsets(repo, files, str | |||||
56 |
|
56 | |||
57 | def strip(ui, repo, node, backup="all"): |
|
57 | def strip(ui, repo, node, backup="all"): | |
58 | cl = repo.changelog |
|
58 | cl = repo.changelog | |
59 |
# TODO |
|
59 | # TODO handle undo of merge sets | |
60 | striprev = cl.rev(node) |
|
60 | striprev = cl.rev(node) | |
61 |
|
61 | |||
62 | keeppartialbundle = backup == 'strip' |
|
62 | keeppartialbundle = backup == 'strip' | |
@@ -142,6 +142,14 def strip(ui, repo, node, backup="all"): | |||||
142 | if not keeppartialbundle: |
|
142 | if not keeppartialbundle: | |
143 | os.unlink(chgrpfile) |
|
143 | os.unlink(chgrpfile) | |
144 |
|
144 | |||
|
145 | # remove undo files | |||
|
146 | for undofile in repo.undofiles(): | |||
|
147 | try: | |||
|
148 | os.unlink(undofile) | |||
|
149 | except OSError, e: | |||
|
150 | if e.errno != errno.ENOENT: | |||
|
151 | ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) | |||
|
152 | ||||
145 | for m in updatebm: |
|
153 | for m in updatebm: | |
146 | bm[m] = repo['.'].node() |
|
154 | bm[m] = repo['.'].node() | |
147 | bookmarks.write(repo) |
|
155 | bookmarks.write(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now