Doing chained diffs w/ Reviewboard

[John Meinel]

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.

but it is telling me:
  The file "utils/syslog/config.go" (revision e1eaf4a) was not found in the
repository

Now I can see that in the "base.diff" it has:
diff --git a/utils/syslog/config.go b/utils/syslog/config.go
index e1eaf4a..1444a56 100644
--- a/utils/syslog/config.go

Which is where it seems to be getting that e1eaf4a. (Though I have to
wonder if it is asking for file content sha1 indexes, why does it need the
actual diff at all?)

Now if I go to the Base Commit Id that I saved above, and do:
 $ git checkout $remember-this-rev
 $ git ls-files -s utils/syslog/config.go
 100644 e1eaf4a87c1493f401f3f928a9058551341fd685 0 utils/syslog/config.go
That does, indeed, exhibit right sha hash:

So it would seem that maybe the issue is that Reviewboard doesn't have all
of the history of trunk in its repository?

Can anyone help? Being able to do chained diffs is a really nice thing, and
I'd like to know how to make it work.

John
=:->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20140918/92f9e09e/attachment.html>