subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: Feature Request: svn status should provide a conflict check functionality via exit code
Date Tue, 09 Jan 2018 09:51:21 GMT
H.-Dirk Schmitt wrote on Tue, 09 Jan 2018 00:16 +0100:
> Hello !
> 
> i missing an easy way to check a local checkout for conflicts.
> 
> Currently I'm grep the output of svn status for the existence of the
> phrase „Summary of conflicts“.
> This is ugly:
> - needs LC_ALL=C ensurance
> - may break in future versions of my the svn client.
> 
> A better way would to have an --check-conflict option which would
> ensure an non-zero exit code if any conflict is detected.

The usual answer to this is "grep for a 'C' in the first, second, or
seventh column" (for text/prop/tree conflicts respectively), but I can
see how future versions might add messages (such as "Summary of
conflicts:" or "--- Changelist 'foo':") that would match those grep
patterns (as false positives).  The best (current?) way to mitigate this
risk is to use 'svn status --xml'.

Cheers,

Daniel

Mime
View raw message