[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: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2005-03-03 14:51:23 CET

On Wed, 2005-03-02 at 23:02 -0500, Simon Perreault wrote:
> On March 2, 2005 22:53, Girish Balakrishnan wrote:
> > John, I want functionality of svn merge which can take a unified diff!!
> This is impossible because the unified diff does not even contain the
> information required for a full merge. How does it know files which have been
> deleted or added, or moved?

You could add this info to the non-important (IE skipped) parts of the
unified diff, and still have a valid unified diff. At least, i believe
it to be possible.
Then your patch would work with patch, and do something, and work with
subversion, and do everything.
Of course, defining such a patch format is not an easy task :)

> I read somewhere that it was in the long term
> plans of the subversion team to develop a new patch format that would include
> that information, but for the time being it doesn't exist.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 3 14:52:41 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.