On 4/26/13 6:26 PM, Nicholas Nethercote wrote:
If I have a patch ready to land when inbound closes, what would be the
sequence of steps that I need to do to land it on inbound2?
The following steps assume that the default and default-push for your
repo are both appropriate versions of inbound and that "i2" and
"i2-push" are the appropriate versions of inbound2 (you can create such
aliases in your .hgrc). They also assume that since inbound just closed
there is bustage on inbound that is not going to be present on inbound2
and that you have already pulled this bustage into your tree.
1) Make sure your patch-to-land is tracked by mq
2) hg qpop -a
3) hg strip "roots(outgoing('i2'))"
4) hg pull -u i2
5) hg qpush your patches
6) hg qfin -a && hg push i2-push
Step 3 is slightly annoying because you have to quote the parens from
the shell....
In any case, the upshot of the above steps is that after step 4 your
tree is effectively a clone of inbound2, and then you just push to it
normally.
If your patches are not tracked by mq and you don't want them to be thus
tracked then things are more complicated: as far as I can tell you want
to pull into the same tree from inbound2, transplant your patch on top
of the tip of inbound2, strip out the bits of inbound that shouldn't be
landing, then push.
-Boris
_______________________________________________
dev-platform mailing list
dev-platform@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-platform
