Re: redundant "conflicts"

Ben Collins-Sussman <sussman@collab.net> writes:

> 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

Will do.

> works, that's great. Give us a regression test, too. :-)

Won't that require me to do battle with a Python? :-P

  // Marcus

---------------------------------------------------------------------
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