Show More
@@ -163,7 +163,6 b' import sys' | |||||
163 | from mercurial import cmdutil |
|
163 | from mercurial import cmdutil | |
164 | from mercurial import discovery |
|
164 | from mercurial import discovery | |
165 | from mercurial import error |
|
165 | from mercurial import error | |
166 | from mercurial import changegroup |
|
|||
167 | from mercurial import copies |
|
166 | from mercurial import copies | |
168 | from mercurial import context |
|
167 | from mercurial import context | |
169 | from mercurial import exchange |
|
168 | from mercurial import exchange | |
@@ -823,8 +822,7 b' def _histedit(ui, repo, state, *freeargs' | |||||
823 | backupfile = repo.join(state.backupfile) |
|
822 | backupfile = repo.join(state.backupfile) | |
824 | f = hg.openpath(ui, backupfile) |
|
823 | f = hg.openpath(ui, backupfile) | |
825 | gen = exchange.readbundle(ui, f, backupfile) |
|
824 | gen = exchange.readbundle(ui, f, backupfile) | |
826 | changegroup.addchangegroup(repo, gen, 'histedit', |
|
825 | gen.apply(repo, 'histedit', 'bundle:' + backupfile) | |
827 | 'bundle:' + backupfile) |
|
|||
828 | os.remove(backupfile) |
|
826 | os.remove(backupfile) | |
829 |
|
827 | |||
830 | # check whether we should update away |
|
828 | # check whether we should update away |
General Comments 0
You need to be logged in to leave comments.
Login now