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

Re: [RFC] Shelving and Checkpointing

From: Julian Foad <julianfoad_at_apache.org>
Date: Wed, 12 Jul 2017 21:41:32 +0100

Bert Huijben wrote:
> Julian Foad wrote:
>> Mark Phippard wrote:
>>> [...] does patch just create conflicts that you
>>> resolve like anything else?
>>
>> It is 'svn patch' -- so it raises conflicts.
>
> Svn patch creates reject files. It doesn't create conflicts (yet).

Gosh, so it does! How primitive! :-)

I will expand on that aspect.

- Julian
Received on 2017-07-12 22:41:37 CEST

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