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

Re: Patch command execution

From: Zack Weinberg <zack_at_codesourcery.com>
Date: 2002-02-07 17:46:21 CET

On Thu, Feb 07, 2002 at 10:33:44AM -0600, Karl Fogel wrote:
> Daniel Berlin <dan@dberlin.org> writes:
> > There's no way around that, actually.
> > It auto-skips the rest of the patch.
> > Ideally, what you want it to do, is match hunks that exist, and ignore
> > them if they are the same, but apply those hunks that don't exist.
> >
> > But of course, patch, on detecting one reversed hunk, will skip the rest
> > of the patch.
> Arrgh. If that's the case, then I guess we can't pass -N, and we'll
> have to live with the occasional bogus reject.

Why don't we just create a third file containing just the in-repo
changes and do a 3-way merge, every time we encounter a file that's
been simultaneously modified in the WC and the repo? See merge(1)
which I think comes with RCS.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006

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.