You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Marc Pawlowsky <ma...@gmail.com> on 2019/03/07 03:08:26 UTC

Feature Request: svn update --accept failure

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.

The exit code should be non-zero, so it is easy to detect.

This new behaviour would only occur with a new option to --accept, I like
"--accept failure".

Another addition that work with "--accept failure" is if svn update also
had --dry-run.

Thanks for your considering this feature.

   Marc Pawlowsky

Re: Feature Request: svn update --accept failure

Posted by Branko Čibej <br...@apache.org>.
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

Re: Feature Request: svn update --accept failure

Posted by Branko Čibej <br...@apache.org>.
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.

-- Brane