Here is how I do this for SVN, it's not the cleanest but it works. The key
is not to post-review on the branch explicitly, but pseudo-post-review (for
lack of a better term) on the branch relative to trunk. Make all your
changes to your branch and commit, as you are doing. Eventually sync the
trunk changes to your branch, resolve conflicts, and commit, as you plan to
do. Next, in a another working copy merge your branch changes back to
trunk. Use RBTools to post these uncommitted changes from your working
copy. This will pick up all the changes from your branch while excluding
all those from trunk.
On Monday, May 9, 2016 at 1:24:50 PM UTC-4, Aaron Lager wrote:
> Is there a way to skip or exclude one or more revisions when generating
> the diffs? Or some other way to remove unwanted diffs within a range?
> The use case I'm in is I was working on a new feature branch, while the
> rest of the team was working on trunk. Once a day I would sync to trunk
> and resolve conflicts. Sync with trunk pulls in all the changes that the
> rest of the team did, including new files, and changes to the same files I
> was working on.
> Now we want to do a post-commit review of the branch. The problem is,
> it's like reviewing all the changes that everyone made.
> In tortiseSVN log view, I can select the range of revisions I want to view
> the diffs, and then de-select the revisions where I synced to trunk, thus
> showing only files and edits that I made.
> Thanks for any ideas!
Supercharge your Review Board with Power Pack:
Want us to host Review Board for you? Check out RBCommons:
Happy user? Let us know! https://www.reviewboard.org/users/
You received this message because you are subscribed to the Google Groups
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.