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

svn merge --accept HUH ?

From: Paul Hammant <paul_at_hammant.org>
Date: Fri, 11 Sep 2009 10:37:23 -0500

I'm a seven year user of Svn, and new to this list, greetings folks.

Before filing a bug, I'm to check here with y'all. Here's what I'm
trying to do ...

     cd <my-trunk-dir>
     svn up

     svn merge --accept theirs-full <url-of-branch-to-merge-in> .

The last list, despite the doco, offers merge conflicts for me to
arbitrate over. We have kdiff3 linked in, but I suspect that the same
would be true for the command line arbitration too. I expected to not
be bothered by such issues given I specified "--accept theirs-full".

It looks like (undocumented) that --accept=theirs-full is also
acceptable for svn. Mis-spell any of those chars and svn will barf
with un-recognised params.

We're using Svn 1.6.3 on server and client. Day to day commits are
working well, and we've merged before but without the --accept option.

Have I got the syntax wrong? Or is this feature not working when it
should be (for merge as opposed to resolve).



- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-11 17:39:30 CEST

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.