Compare and diff directly between local topic and server master branch when rbt post

2015-05-29 Thread Qi Luo
Our team is running github-flow which means we develop on topic branches and then merge them into master branch. The review happens before merge. I've just tested how to use Review Board with above workflow. And I found the diff generated by rbt post was only diff between origin/master and

Re: After upgrading to ReviewBoard 2.0.15 the existing reviews do not display the diffs correctly

2015-05-29 Thread Papaswede
Oh ok, thanks for the info! We typically just use the IDE to generate a .patch file and then upload it to reviewboard. The projects in our IDE are usually set up as one for trunk and one for each branch, so when it generates the .patch files it generates them with relative paths using /trunk

Re: RBTools 0.7.3 is released!

2015-05-29 Thread Stephen Gallagher
On Wed, May 27, 2015 at 8:48 PM Christian Hammond christ...@beanbaginc.com wrote: Hey everyone, We've put out a new release of RBTools 0.7.3, which fixes quite a number of bugs, including those annoying Unicode issues many of you have hit. It also has some new useful features you may want,

Re: Compare and diff directly between local topic and server master branch when rbt post

2015-05-29 Thread Qi Luo
Hi Rennie, I understood your solution, it works for most cases. But if remote/master has changed just during review progress, the diff would not be exactly synced with latest commit on master. I have to rebase every time in the way of your solution. What I expect is rbt can directly and

Re: Compare and diff directly between local topic and server master branch when rbt post

2015-05-29 Thread Stephen Gallagher
You should always do a git rebase against the master branch before submitting a code review. Otherwise, your review diff may end up including a lot of unrelated changes. On Fri, May 29, 2015 at 10:32 PM Qi Luo qilu...@gmail.com wrote: Hi Rennie, I understood your solution, it works for most

Re: After upgrading to ReviewBoard 2.0.15 the existing reviews do not display the diffs correctly

2015-05-29 Thread Christian Hammond
When manually uploading Subversion diffs, Review Board will prompt you for the base path of the diff. This is the path relative to the root of the Subversion repository where the diff was generated in. For instance, it may be /trunk or /branches/branchversion. Whatever you specify will be

Re: RB migrate and upgrade from 1.6.16 to 2.0.15

2015-05-29 Thread Christian Hammond
Glad it works! - Christian  -- Christian Hammond - christ...@beanbaginc.com Review Board - https://www.reviewboard.org Beanbag, Inc. - https://www.beanbaginc.com -Original Message- From: John McGowan john.mcgow...@gmail.com Reply: reviewboard@googlegroups.com