Hi All,
I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is /bin/bash).
Trying to use merge and have it automatically accept my changes during
conflicts by issuing:
svn merge --accept mine-full -c 12345
https://repository/branches/blah/blah/blah
also tried the following variants:
# based on svn help resolve (uses = in accept argument)
svn merge --accept=mine-full -c 12345
https://repository/branches/blah/blah/blah
# trying with single quotes as listed in svn help merge
svn merge --accept='mine-full' -c 12345
https://repository/branches/blah/blah/blah
# trying same as beginning, but with single quotes
svn merge --accept 'mine-full' -c 12345
https://repository/branches/blah/blah/blah
with no luck.
What is supposed to work?
Thanks in advance,
David