OK, found it ..
.. for --accept to be processed in any way whatsoever, /etc/subversion/
config can't contain any entries for diff3
One presumes the same would be true on if you specified --diff3-cmd on
the command line (which we were not).
Regards,
- Paul
On Sep 11, 2009, at 10:37 AM, Paul Hammant wrote:
> 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).
>
> Thoughts?
>
> Regards,
>
> - Paul
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2393636
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2393646
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-11 17:59:26 CEST