equal
deleted
inserted
replaced
143 os.unlink(chgrpfile) |
143 os.unlink(chgrpfile) |
144 |
144 |
145 for m in updatebm: |
145 for m in updatebm: |
146 bm[m] = repo['.'].node() |
146 bm[m] = repo['.'].node() |
147 bookmarks.write(repo) |
147 bookmarks.write(repo) |
148 # remove potential unknown phase |
|
149 # XXX using to_strip data would be faster |
|
150 phases.filterunknown(repo) |
|
151 except: |
148 except: |
152 if backupfile: |
149 if backupfile: |
153 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
150 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
154 % backupfile) |
151 % backupfile) |
155 elif saveheads: |
152 elif saveheads: |
156 ui.warn(_("strip failed, partial bundle stored in '%s'\n") |
153 ui.warn(_("strip failed, partial bundle stored in '%s'\n") |
157 % chgrpfile) |
154 % chgrpfile) |
158 raise |
155 raise |
159 |
156 |
160 repo.destroyed() |
157 repo.destroyed() |
|
158 |
|
159 # remove potential unknown phase |
|
160 # XXX using to_strip data would be faster |
|
161 phases.filterunknown(repo) |