# HG changeset patch # User Nicolas Dumazet # Date 1279019552 -32400 # Node ID 59bd20451ab68fdac8bb329b814cc004615554cf # Parent 958022f0f1d57c2cd39d9afa4e0b1f355769d598 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. diff -r 958022f0f1d5 -r 59bd20451ab6 hgext/rebase.py --- a/hgext/rebase.py Mon Jul 12 17:55:23 2010 +0900 +++ b/hgext/rebase.py Tue Jul 13 20:12:32 2010 +0900 @@ -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):