[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: Josha Foust <jfoust_at_mankowindows.com>
Date: 2005-10-18 17:16:11 CEST

> -----Original Message-----
> From: Kalin KOZHUHAROV [mailto:kalin@thinrope.net]
> Sent: Tuesday, October 18, 2005 9:31 AM
> To: dev@tortoisesvn.tigris.org
> Subject: Re: Selective Merge
> Josha Foust wrote:
> > 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).
> Kalin.

Well, I didn't mean to put each section into its own file. The situation
would be that you want to split a patch up into n logical patch sets, where
n is a small number (2-5 or so). You would go through and select which
patch set you want to put each section into. Then you could un-apply n-1 of
the patch sets, commit, and then apply each of the remaining patch sets and
commit them in turn. It could even be automated. Of course you could have
problems with incorrectly splitting patches and dependencies between

It is just a way to make splitting out logical patch sets from a single
large patch. I figured that some kind of tool would exist for splitting
patches that people like Linus of Alan Cox would use when dealing with
merging the huge number of patches they get.

This concept could also be used to deal with the problem of having the same
file in different commit groups that is being talked about in a different

Josha Foust

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 18 17:16:47 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.