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

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 14 Apr 2010 22:02:56 +0200

On Wed, Apr 14, 2010 at 09:27:25PM +0200, Daniel Näslund wrote:
> On Wed, Apr 14, 2010 at 08:18:06PM +0200, Alan Barrett wrote:
> > I don't buy the argument that it's necessary, for consistency with
> > current svn behaviour, to copy context lines from the patch to
> > the output file.

It is consistent with current "svn patch" behaviour.
I never meant to argue that there was some consistency with the
rest of svn.

> Nope, it wouldn't be an incompatible change. It's just that it would
> involve rewriting how we construct the streams from the patch and how we
> apply the hunks.

Yes, and that is why it's a separate problem.

We can implement the whitespace ignore matching parts,
while getting context from the patch as we do now.
If folks want us to copy context lines from the target instead of
the patch, that can probably be done. But it is a different problem.
Let's not mix up two different problems.

Stefan
Received on 2010-04-14 22:03:36 CEST

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