Re: Tree conflict resolution considered harmful

Dag-Erling Smørgrav wrote on Thu, 30 Aug 2018 23:49 +0200:
> Daniel Shahaf <d.s_at_daniel.shahaf.name> writes:
> > Dag-Erling Smørgrav <des_at_des.no> writes:
> > > % svn resolved $(svn stat | awk '$2 == "C" { print $3 }')
> > 'svn resolved -R ./' is equivalent and more robust.
>
> No. My command line only resolves tree conflicts. Yours also resolves
> text conflicts.

Fair enough. I don't think we have an easy syntax for resolving only
tree conflicts.

You probably know the following, but for the list's benefit I'll say it:
awk(1) is not a robust way to parse `svn status` output; the output is
columns-oriented, not whitespace-separated-fields oriented. `svn st |
cut` or `svn st --xml` are the recommended idioms.

Cheers,

Daniel
Received on 2018-08-31 00:31:46 CEST