On Thu, Dec 13, 2018 at 6:05 PM Randell Jesup <rjesup.n...@jesup.org> wrote:
> >> tl;dr: I need to figure out how I'm going to dig out of the rebasing > hole > >> I'm now in, and could use advice/help, and I think the above sequence > >> doesn't work for queues of dependent patches. > > > >If I'm understanding your situation correctly, I believe you can use > rebase > >to update a whole queue of dependent patches, provided you have the > >format-source extension enabled. > > [snip] > > Thanks - that was the sequence I thought might work, after hearing from > pehrsons that the rebase would reformat all the pushed patches. hg qfin -a > is critical I think. > Indeed it is. It converts the "mq" patches to "real changesets", allowing the Mercurial rebase to correctly reformat the patches through the formatsource extension. > If I wanted to optimize this, perhaps for each independent sequence: > hg update -r <rev of parent of base patch>; hg qpush (*N); > You probably need `hg qfin -a` here. I don't think you can rebase mq patches as long as they're still mq patches (but I could be wrong about that.) > hg rebase -d PRE_TREEWIDE_CLANG_FORMAT (assuming > this does what I expect); resolve any bitrots; > If by what you expect, you mean rebase the patches on top of the changeset before the tree-wide reformat, then yes. This should simplify resolving conflicts somewhat, I think, by splitting the conflict resolution to two phases (before and after the reformat) which is I think your goal here. > hg rebase -d <DEST tip>; > (hg qimport -r tip; hg qpop) (*N) > > Almost automatable (probably automatable; may not be worth it). > > Thanks! I'll let people know if it works > Good luck! -- Ehsan _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
