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...
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
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
Certainly git can do the same try a merge of branch A into master, and
then try a merge of branch B into that and use that as the diff. And if
rbt can take just a diff to post, then we should be able to publish that.
But I don't know where the data of *what* branches are involved would be
stored,
+1 to that
On Thu, Sep 18, 2014 at 7:53 PM, 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
Also, be watchful for the other reviewboard footgun, paged diffs.
Reviewboard pages large reviews, so if you're used to thinking 'phew,
i've gotten to the end of the page, i'm done, check again, there
maybe a surprise waiting for you at the bottom of the page.
On Thu, Sep 18, 2014 at 9:03 PM,
