rebase: re-add patches to mq repo after rebase

Since b4eaab2f8dee, we are adding patches after the qimport call, and not
inside it anymore. Correct updatemq to match the new behaviour.
This commit is contained in:
Nicolas Dumazet 2010-07-13 20:12:32 +09:00
parent 5651c754f9
commit a34bba6494

View File

@ -364,6 +364,10 @@ def updatemq(repo, state, skipped, **opts):
repo.mq.qimport(repo, (), patchname=mqrebase[rev][0],
git=mqrebase[rev][1],rev=[str(state[rev])])
repo.mq.save_dirty()
qrepo = repo.mq.qrepo()
if qrepo:
qrepo[None].add(repo.mq.added)
repo.mq.added = []
def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches,
external):