Re: RFC: Ignoring conflict artifacts

2011-11-01 Thread C. Michael Pilato
On 11/01/2011 08:31 AM, Daniel Shahaf wrote: > On Tuesday, November 01, 2011 8:18 AM, "C. Michael Pilato" > wrote: >> I think I'm okay with adding this intentional ignoring logic in the >> command-line client (so long as it can be overridden). I'm less okay with >> modifying our APIs to automati

Re: RFC: Ignoring conflict artifacts

2011-11-01 Thread Daniel Shahaf
On Tuesday, November 01, 2011 8:18 AM, "C. Michael Pilato" wrote: > On 11/01/2011 08:00 AM, Daniel Shahaf wrote: > > Stefan2 asks how to ignore the *.{merge-left,merge-right,mine} files > > when presenting a list of 'svn add' candidates. > > > > On IRC his solution is to loop through `svn info |

Re: RFC: Ignoring conflict artifacts

2011-11-01 Thread C. Michael Pilato
On 11/01/2011 08:00 AM, Daniel Shahaf wrote: > Stefan2 asks how to ignore the *.{merge-left,merge-right,mine} files > when presenting a list of 'svn add' candidates. > > On IRC his solution is to loop through `svn info | grep > '^Conflict.*File: '` in the directory. (The alternative was to strip