Doing chained diffs w/ Reviewboard

[Adam Collard]

On 18 September 2014 10:49, John Meinel <john at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20140918/2f94195b/attachment.html>