Skip to content
Snippets Groups Projects
Commit 59bd20451ab6 authored by Nicolas Dumazet's avatar Nicolas Dumazet
Browse files

rebase: re-add patches to mq repo after rebase

Since 1b82a26635d7, we are adding patches after the qimport call, and not
inside it anymore. Correct updatemq to match the new behaviour.
parent 958022f0f1d5
No related branches found
No related tags found
No related merge requests found
......@@ -364,6 +364,10 @@
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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment