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

Re: redundant "conflicts"

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-01-23 23:47:01 CET

Marcus Comstedt <marcus@mc.pp.se> writes:

> As it seems that gpatch is used to do the actual work, won't simply
> adding the -N flag fix the problem?

Hey, see if it works! Try it out by adding this flag to our
invocations of 'patch' in libsvn_wc/get_editor.c:close_file(). If it
works, that's great. Give us a regression test, too. :-)

---------------------------------------------------------------------
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:36:58 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.