equal
deleted
inserted
replaced
201 if troffset == 0: |
201 if troffset == 0: |
202 repo.store.markremoved(file) |
202 repo.store.markremoved(file) |
203 |
203 |
204 deleteobsmarkers(repo.obsstore, stripobsidx) |
204 deleteobsmarkers(repo.obsstore, stripobsidx) |
205 del repo.obsstore |
205 del repo.obsstore |
206 |
206 repo._phasecache.filterunknown(repo) |
207 repo._phasecache.filterunknown(repo) |
207 |
208 if tmpbundlefile: |
208 if tmpbundlefile: |
209 ui.note(_("adding branch\n")) |
209 ui.note(_("adding branch\n")) |
210 f = vfs.open(tmpbundlefile, "rb") |
210 f = vfs.open(tmpbundlefile, "rb") |
211 gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) |
211 gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) |
212 if not repo.ui.verbose: |
212 if not repo.ui.verbose: |