[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: Kalin KOZHUHAROV <kalin_at_thinrope.net>
Date: 2005-10-18 16:30:39 CEST

Josha Foust wrote:
>>-----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
>>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).
> Does anyone know of a tool for manipulating patch files? I was thinking of
> something that could take a patch and easily split it apart by each section
> into different patches. That could make separating logical change sets a
> lot easier.

Use your favourite editor (or change ot if it cannot do that). vim and (x)emacs do it with the
correct setup. A perl one-liner can split a unified patch into many files, but I have never imagined
that you may need to use that (tell me and I'll write it, to tired now).


|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 18 16:34:12 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.