Hi John and Dale,
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) So as
we have a .patch file we use Larry Wall`s patch(you are right Dale!)
utility to do the applying of patch. Perfect!!! But it seems that
directory level operations are not supported by the old patch utility.
If we use svn merge it is possible to do that. So I wanted to knwo any
way of writing a small .exe which can take a diff file and use it to
do a merge (as svn merge does it)?????
I want to have directory level operations also to be applied. I took a
look at the SVN code for it but got lost in the details!! But am
trying more today!! :)
John, I want functionality of svn merge which can take a unified diff!!
hope I am clear!!
Girish
On Wed, 02 Mar 2005 11:09:05 -0500, John Peacock <jpeacock@rowman.com> wrote:
> Girish Balakrishnan wrote:
>
> > Is it possible to write a program that can take svn diff as a
> > file(a patch file) and then apply it to the local working copy. The
> > svn merge should be doing the same right? Creating a diff from the
> > URLs and then applying it to the local working copy.
>
> I don't understand; `svn diff` produces a unified diff file which the
> standard patch program understands just fine (modulo renames I believe).
> Are you not trusting merge and wanting to check up on it? Could you
> be more specific about what you are trying to accomplish?
>
> John
>
> --
> John Peacock
> Director of Information Research and Technology
> Rowman & Littlefield Publishing Group
> 4501 Forbes Boulevard
> Suite H
> Lanham, MD 20706
> 301-459-3366 x.5010
> fax 301-429-5748
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 3 04:54:41 2005