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

Re: Feature Request: svn update --accept failure

From: Branko Čibej <brane_at_apache.org>
Date: Thu, 7 Mar 2019 04:29:16 +0100

On 07.03.2019 04:24, Branko Čibej wrote:
> On 07.03.2019 04:08, Marc Pawlowsky wrote:
>> Sometimes failure is an option.
>>
>> I am working inside a complex scripting environment.  It would be
>> better if when svn update detects a conflict that the update did not
>> occur and that the command would fail.  The versioned versions of the
>> file could still be crated and maybe another one that would have the
>> standard conflict markers, but the original file should be unchanged
>> versus copied into the .mine.
>
> I understand what you want, but this feature would require rather
> fundamental changes to how update works. It's not atomic.
>
> However, if you can live with just the individual conflicted files
> remaining unchanged, then I believe the option is --accept=mine-full.
> But I don't think that would be very useful.

The work on shelving and  checkpointing SHOULD eventually add this
feature (just not as a switch for 'svn update').

-- Brane
Received on 2019-03-07 04:29:27 CET

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