Re: Delivering branch usage question

Andrew Sasak wrote:
> This is partly a Tortoise question and partly an SVN question. When I am
> done working on a branch and ready to merge to the trunk I usually want
> to have a code review for the whole change set. To do this I merge the
> branch changes into a trunk working copy and then use the commit dialog
> to compare each file. I like this as it allows me to use WinMerge for
> the diff. I believe I would be just as happy doing a comparison of
> branch "tail" vs. WC for the branch, however I haven't found any good
> way of doing this which allows me to use WinMerge *and* use the WC in
> the diff as opposed to the head. I like having the WC in the diff window
> as it allows me to easily make changes and save them.
> As a result of preparing for the code review or the code review itself,
> I invariably end up adding a comment here or there or making some minor
> changes. Since these changes are applied to a trunk WC there doesn't
> seem to be an easy way of getting these changes back into the branch,
> and making sure the branch includes these changes seems necessary.
>
> I would be surprised if anybody has a hard time following this, I'd be
> happy to try to clarify anything.
>
> Is there any way to do a comparison of a revision vs. the working copy?
> When I try to do this it seems to do a unified diff, then uses
> TortoiseMerge which prevents me from making any changes directly in the
> comparison window. The best/only solution seems to be to do the
> comparison of the branch "tail" vs "head". And if any changes are made
> in the diff window, to manually "save as" back to the working copy.

For now, the only way to use WinMerge for this is to check out (or
export) a copy from where you started the branch, then do a folder
compare with WinMerge.

you could also try a nightly build (beware of the working copy version
update: older clients won't be able to access your working copy
anymore), because TortoiseMerge now has editing capabilities.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org