Re: Clarification of Pre-Commit Workflow

2014-08-12 Thread Kevan Stannard
OK, thanks David. Regards Kevan On Tuesday, 12 August 2014 09:22:55 UTC+10, David Trowbridge wrote: TRACKING_BRANCH should be set to something which is present in the upstream copy of the repository that Review Board is talking to. In general, it should be whichever branch you are

Re: Clarification of Pre-Commit Workflow

2014-08-11 Thread David Trowbridge
TRACKING_BRANCH should be set to something which is present in the upstream copy of the repository that Review Board is talking to. In general, it should be whichever branch you are looking to eventually merge to. For example, in Review Board itself we have a .reviewboardrc which defines

Re: Clarification of Pre-Commit Workflow

2014-08-07 Thread Kevan Stannard
Many thanks Christian. If we're working in our own branch then what value should we use for TRACKING_BRANCH in .reviewboardrc? At the moment we've committed .reviewboardrc, but perhaps we should add it to git's ignore list and just set the TRACKING_BRANCH to our own working area branch?

Re: Clarification of Pre-Commit Workflow

2014-08-06 Thread Christian Hammond
Hi Kevan, That’s the workflow, though we strongly encourage you to post to a branch based off master, and then only merge to master once it’s reviewed. rbt post will post from the upstream tracking branch (defaulting to origin/master, customizable by TRACKING_BRANCH in .reviewboardrc or

Clarification of Pre-Commit Workflow

2014-08-05 Thread Kevan Stannard
I've been reading the workflow page here: https://www.reviewboard.org/docs/manual/2.0/users/getting-started/workflow/ We're planning to follow the pre-commit workflow. Would be grateful if someone could clarify some of the steps for us. Here's my current understanding of the first few steps: