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

Re: How to apply a patch with Subversion

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-09-28 12:06:03 CEST

On Sep 28, 2005, at 08:42, Saminda Abeyruwan wrote:

> I'm a committer and developer for Apache Axis2 SOAP stack. I've
> been committing code for a while. With the popularity of Axis2 and
> new contributors volunteering for the project and applying patches
> (diff), we found it is very easy to upgrade the stack. I know how
> to commit the code, but i don't know how to apply a patch. I've
> been heard that "merge" can be used. But I've not met a correct
> guide line to do this.
>
> Could any developer/user please be kind enough to tell me the
> syntax to apply a patch (diff).

If you're saying that you have commit access to the project, and you
have a working copy of the project, and someone without commit access
is sending you a standard Unix diff of some changes, and you want to
commit these, then you simply use the normal Unix patch command to
apply the changes to your working copy, test them, and check them in.

Note that this would only apply to changes to existing files. AFAIK
the Unix patch format cannot represent the addition or deletion of
files, and these would need to be handled separately for Subversion
anyway, in that you would need to svn add the files you want to add,
and svn delete the files you want to delete.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 28 12:09:31 2005

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