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

RE: svn_client_patch()

From: Sander Striker <striker_at_apache.org>
Date: 2003-04-06 12:19:39 CEST

> From: SteveKing [mailto:steveking@gmx.ch]
> Sent: Sunday, April 06, 2003 9:10 AM

> > > > IMHO we would do better to recommend that people install a patch
> > > > program than take on the responsibility of maintaining such code
> > > > ourselves.
> Please be kind if I'm asking here stupid questions, but isn't subversion
> already doing something similar like patch when doing merges?

'something similar like patch'... well, define 'similar'. We do something
similar to diff3 -mE, but we skip the textual diff creation step and
directly output the merged file (with conflict markers).

Having to parse patch files opens a whole new can of worms...

>>>> Someday, if/when we have a patch format that does more than
>>>> conventional patch format, then we can consider a new tool.
> That was what I was asking for - a patch format which also includes
> the log message.

And includes renames, copies, additions and deletions... and properties
(and possibly even merge history, but that could be in properties aswell).

> Ok, I admit it isn't a feature which can't wait but
> I would definitely mark it as 'nice to have' and therefore maybe
> even file an issue for post-1.0?

AFAIK we already have such an issue.
>> 1. Property diff application.
> Never noticed that properties weren't applied with patch. Now
> that would be something that even might mark the gnu patch
> useless for some scenarios. Imagine if someone does some
> changes which _need_ some changes in the properties to
> get the whole patch to work - then the sent in patch file
> can't be applied...

It would be nice to create a new patch format which will work with
regular 'patch' for trivial changes.

>> 2. Conflict markers!! Regular 'patch' will just crap out on
>> conflicting hunks -- this behavior is poo. 'svn patch' could
>> behave just like 'svn merge', except from a stream source
>> instead of a repository. :-) Now tell me that isn't Goodness!

Errm... You mean apply the patch to the source it was created against and
then do a diff3 (or something more sophisticated. More on that later)
between the creation source, the patched source and the working copy?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 6 12:20:22 2003

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.