[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Colin Braly <colin.braly_at_gmail.com>
Date: Wed, 6 Mar 2013 16:39:58 +0100

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", 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.

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

Thanks a lot,
Colin
Received on 2013-03-06 20:29:17 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.