[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: Chia-liang Kao <clkao_at_clkao.org>
Date: 2005-03-03 13:29:28 CET

John Peacock <jpeacock <at> rowman.com> writes:
> > 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)
> One thing to consider is using SVK:
> which makes merging unbelievably easy (as opposed to base Subversion, where it
> is just easy).

FYI, if you use svk, with or without commit access to the original repository
you are branching from, you can use ordinary commit/push with an additional "-P
-" command line option. This will create a patch consisting a block of unidiff,
and an additional block of svk patch, which you can then use "svk patch apply"
to apply. Look for "patch" in the right side of http://0rz.net/4d0d1.

Now, the svk patch block is like a "floating branch", that records what tree the
patch was to apply to, and can be used for performing proper 3-way merge if the
target has changed since the patch was generated, so so goodbye to the
unreliable fuzzy offset from your /usr/bin/patch. More over, it convoys add,
del, and prop changes for the merge that the original message was asking for.



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:44:10 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.