Re: [TSVN] user question: reviewing changes made on a branch

Michael Colefax wrote:
> Rainer Müller wrote:
>
>>Why? You always merge into a WC and you can use "Check for
>>Modifications" to review the changes. After the review you commit them
>>if everything is fine.
>
>
> I need to keep the "review" and "merge" steps separate.
> They are done by different people at different times.
>
> The "review" includes a refactor, resulting in further
> development on the branch. The reviewer needs to inspect
> changes made on the branch, and then may make further changes.

Then you can use any Diff-Tool like WinMerge or KDiff3 to diff the whole
WC tree. Just check out another WC of trunk and compare it to the WC of
the branch.

Or you just do the merge into a trunk WC but don't commit it.

> The author is then interested in the set of changes made
> on the branch by the reviewer. Only after all this is the
> code ready to be merged to the main trunk.

The author could even look at the unified diff output from merge dialog
(harder to read but you see the changes).

I don't see any better way in Subversion to do something like this...

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Mar 9 18:37:44 2005