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

merge does not allow --accept argument

From: Siefert, David <dsiefert_at_playboy.com>
Date: Fri, 18 Dec 2009 14:44:36 -0600

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
Received on 2009-12-18 21:46:49 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.