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

RE: merge does not allow --accept argument

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 18 Dec 2009 15:53:00 -0500

> 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

The above looks right.

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

Can you be more specific? What do you mean by "no luck".

Are you getting an error on your command line. Is it not accepting your files on conflicts?

BOb
Received on 2009-12-18 21:53:36 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.