RE: Re: Selective Merge

I've never used patches, so I'll have to play with that to see how it works, first. Thanks for the tip!

Michael

-----Original Message-----
From: Rory McGuire [mailto:rlpm@vandyke.com]
Sent: Friday, October 14, 2005 5:27 PM
To: dev@tortoisesvn.tigris.org
Subject: Re: Selective Merge

Rainer Müller wrote:
> Flanakin Michael C Ctr HQ OSSG/OMR wrote:
>
>> I'd like to see a selective merge capability. By "selective merge," I
>> mean that I want to do a dry run and then choose which file changes I
>> want to be implemented and which I don't. I basically want the same
>> functionality as when I do a commit. This would be easier than
>> merging everything and committing only specific parts that I have to sift thru.
>
> Since this is not supported by Subversion you could create a patch
> file and edit it for your needs before applying it to your WC.
>
> Rainer

You could also create a patch file and then use "Apply Patch", selectively applying changes in TortoiseMerge, rather than having to edit the patch file by hand.

How about the following feature request for merging: allow creation of a temporary patch file passed to TortoiseMerge, rather than applying the patch directly (using the Subversion library).

--rlpm

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 17 15:40:16 2005