subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "C. Michael Pilato" <cmpil...@collab.net>
Subject Re: [SVN UPDATE] Is the "--accept postpone" option strickly included in the "--non-interactive" one ?
Date Wed, 06 Mar 2013 19:45:54 GMT
On 03/06/2013 10:39 AM, Colin Braly wrote:
> Hi there,
> 
> As regards conflicts, with the command "svn update" :
> - SVN prompt :
> 
> |# svn update
> Conflict 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", nothing is printed (/"take no
> resolution action at all and instead allow the conflicts to be recorded for
> future resolution"/).
> - Nothing is print with a "svn update--non-interactive" either.

Nothing is printed?  That should be.  You should at least see a line such as
"C  text.txt" that notes that your file is in a state of conflict.

> => Is the "--accept postpone" option strickly included in the
> "--non-interactive" one, for a svn update which bring one or more conflicts ?

When in non-interactive mode, Subversion can't ask you how you want to
handle conflicts.  So, by default, yes, --accept=postpone is the mode that
the update will operate in.  You can, however, choose a different mode with
--accept=SOMETHING_ELSE if you wish.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development


Mime
View raw message