[SVN UPDATE] Is the "--accept postpone" option strickly included in the "--non-interactive" one ?

2013-03-06 Thread Colin Braly
Hi there, As regards conflicts, with the command "svn update" : - SVN prompt : # svn updateConflict discovered in 'test.txt'.Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: - With a "svn update --accept postpone", no

[SVN UPDATE] Is there a way to hide the summary of conflicts at the end ?

2013-03-06 Thread Colin Braly
Hi there, When a "svn update" cause a conflict, SVN display at the end of the update a conflict summary : Summary of conflicts: Text conflicts: 2 Property conflicts: 1 Tree conflicts: 1 Skipped paths: 10 Is there a way to hide it ? I locally treat conflict (I print the "C" lines in red, "

Re: [SVN UPDATE] Is the "--accept postpone" option strickly included in the "--non-interactive" one ?

2013-03-07 Thread Colin Braly
at > the update will operate in. It's exactly what I wanted to know ! 2013/3/6 C. Michael Pilato > On 03/06/2013 10:39 AM, Colin Braly wrote: > > Hi there, > > > > As regards conflicts, with the command "svn update" : > > - SVN prompt : > > >