Mercurial > hg
diff hgext/rebase.py @ 11531:59bd20451ab6 stable
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.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 13 Jul 2010 20:12:32 +0900 |
parents | 40c06bbf58be |
children | 0a044e5ff489 |
line wrap: on
line diff
--- 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):