L. David Baron wrote: > On Saturday 2013-04-27 08:26 +1000, 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? > > Would I need to have an up-to-date inbound2 clone and transplant > > the patch across? Or is it possible to push from an inbound clone? > > For what it's worth, what I'd do is qpop the patch, pull the tip of > inbound2 into my inbound clone and update to tip, qpush and qfin the > patch, and then "hg out -rtip inbound2" (and after checking it's > right), "hg push -rtip inbound2".
I would: hg pull inbound2 hg update -c tip (not always correct, but usually) hg graft <my-changesets> The horrible thing about qpop and qpush is that they deal with conflicts very, very poorly, whereas hg graft, hg rebase, and hg pull --rebase allow me to use my three-way merge tool to resolve conflicts. That ends up being a big time saver and IMO it is also much less error-prone. Also, I am not sure "-rtip" is the safest thing to use when you have a multi-headed local repo. I always use "-r ." myself. Cheers, Brian _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
