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
