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

Re: Want to create a patch utility

From: John Peacock <jpeacock_at_rowman.com>
Date: 2005-03-03 13:14:57 CET

Girish Balakrishnan wrote:
> Let me tell you the background. We are using an svn diff to
> generate the .patch file and pass it around. (I know it is a sin as
> per SVN standards!! A branch has to be created and later merged)

This is the part that I don't understand. Why can't you use the Subversion tool
like it was intended? Are you resisting branches for some reason (perhaps a bad
experience with CVS)? If we knew why you feel the need to use patches instead
of merging from branches, we might have better suggestions.

One thing to consider is using SVK:

        http://svk.elixus.org

which makes merging unbelievably easy (as opposed to base Subversion, where it
is just easy).

'svn diff' is not the same thing as `svn merge` since the latter can consider
moves and property changes. I suppose it would be possible to write something
that would take care of the bits that aren't covered by the unified diff format
(and use patch for the rest), but I can't see the point.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4720 Boston Way
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 3 13:14:50 2005

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

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