[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Selective Merge

From: Rory McGuire <rlpm_at_vandyke.com>
Date: 2005-10-15 00:26:58 CEST

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
Received on Sat Oct 15 00:27:24 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.