Doing chained diffs w/ Reviewboard
Ian Booth
ian.booth at canonical.com
Thu Sep 18 10:45:18 UTC 2014
On 18/09/14 20:39, John Meinel wrote:
> So I did get "rbt post" to work with "rbt post -r 54 --parent=REVID", I had
> to be careful because my actual parent branch *didn't* merge the current
> tip of master but the one I was proposing had.
> So instead I ended up rebasing both commits, and then specifying the PARENT
> as the specific rebased commit revision id.
>
> Launchpad had a place to record a prerequisite branch, which I'm sure is
> what lbox was using. Launchpad also computed the diff by starting with
> "master" merging the prerequisite branch into it, and then your diff was
> the diff of merging your branch into the combined diff. Which meant it
> handled all these side cases where your branch merges more of master than
> your parent branch, etc.
>
And that, ladies and gentlemen, is why I *really* miss Launchpad. Doing what
John did sounds error prone and I'm sure I'd mess it up if I tried.
Eric, can we do something on the review board and/or github side to make this
sort of thing easier? Implement a script which follows the Launchpad workflow or
something?
More information about the Juju-dev
mailing list