Re: Tree conflict resolution considered harmful

2018-08-31 Thread Dag-Erling Smørgrav
Daniel Shahaf writes: > 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. N

Re: Tree conflict resolution considered harmful

2018-08-31 Thread Stefan Sperling
On Thu, Aug 30, 2018 at 10:08:36PM +, Daniel Shahaf wrote: > Stefan Sperling wrote on Thu, 30 Aug 2018 14:06 +0200: > > In --non-interactive mode the default value for --accept is 'recommended'. > > This is a backwards incompatible change to the semantics of `svn merge > --non-interactive` (wi

Re: Tree conflict resolution considered harmful

2018-08-31 Thread Stefan Sperling
On Fri, Aug 31, 2018 at 11:06:07AM +0200, Dag-Erling Smørgrav wrote: > Daniel Shahaf writes: > > 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