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. John =:-> On Thu, Sep 18, 2014 at 2:28 PM, Matthew Williams < matthew.willi...@canonical.com> wrote: > I've got it working. Using rbt it was pretty trivial. I'm not 100% sure of > my steps - but from memory and some prompting from `history` the process > was more or less: > > 1) rebase my branch against the latest version of the parent. Then: > > 2) rbt post -parent remotes/mattyw/my-parent-branch > > It appeared that when I ran rbt -u against this branch I still needed to > specify the parent (ISTR that lbox used to remember there was a parent > branch when pushing changes) > > Matty > > > > On Thu, Sep 18, 2014 at 10:53 AM, Adam Collard <adam.coll...@canonical.com > > wrote: > >> On 18 September 2014 10:49, John Meinel <j...@arbash-meinel.com> wrote: >> >>> Has anyone succeeded in getting this to work? >>> >>> The steps I tried to do were: >>> >>> git co master >>> git pull upstream master >>> git co base-branch >>> git diff master... > base.diff >>> git co dependent-branch >>> git diff master... > dependent.diff >>> git merge-base master HEAD > remember-this-rev >>> >>> And then put the "dependent.diff" into the "Diff: *", and then the >>> "base.diff" into "Parent Diff:" and then 'remember-this-rev' into the Base >>> Commit ID. >>> >>> I also tried putting "git merge-base master base-branch" as the Base >>> Commit ID. >>> >> >> This makes me think you're using the UI to do this. >> >> Let me repeat my Public Safety Announcement: Do NOT use ReviewBoard's UI >> for uploading diffs. Please for $deity's sake use rbt post. >> >> >> https://www.reviewboard.org/docs/rbtools/0.6/rbt/commands/post/#distributed-version-control-systems >> >> -- >> Juju-dev mailing list >> Juju-dev@lists.ubuntu.com >> Modify settings or unsubscribe at: >> https://lists.ubuntu.com/mailman/listinfo/juju-dev >> >> >
-- Juju-dev mailing list Juju-dev@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
