On Sun, Sep 14, 2014 at 10:28 PM, Menno Smits <[email protected]> wrote:
> It looks like the TRACKING_BRANCH option in .reviewboardrc could be helpful.
> It defaults to "origin/master" but if we changed it to "upstream/master" I
> suspect Reviewboard will then generate diffs against the shared master
> branch instead of what we might happen to have in master in our personal
> forks. The of course relies on every developer having a remote called
> "upstream" that points to the right place (which isn't necessarily true).
FWIW, I have the following in $GOPATH/src/github.com/juju/juju/.git/config:
[remote "origin"]
url = [email protected]:ericsnowcurrently/juju.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "upstream"]
url = https://github.com/juju/juju.git
fetch = +refs/heads/*:refs/remotes/upstream/*
and in ~/.reviewboardrc:
TRACKING_BRANCH = "upstream/master"
This has worked fine for me (once I realized master had to be up-to-date).
-eric
--
Juju-dev mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/juju-dev
