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

Re: Automated Merge Conflict Resolution before svn 1.5?

From: Michael J Gruber <michaeljgruber+gmane_at_fastmail.fm>
Date: Thu, 17 Jan 2008 13:14:17 +0100

M@ Hunter venit, vidit, dixit 16.01.2008 16:39:
> I've spent a fair deal of time looking for an answer to this, and I'm
> left with the feeling that I may be out of luck until version 1.5 is
> out. I'm hoping, however, that someone has a solution I can use
> now...
> This was working great until the other day when we saw an unexpected
> conflict merging the time-stamp branch into 'current'. Because we're
> never modifying 'current' directly, we mistakenly assumed there
> would never be conflicts. We obviously mis-understood the difference
> between update and merge in this respect.
> I've seen that in svn 1.5, there will be a way to resolve conflicts
> by saying '(m)ine or (t)heirs' - which seems perfect, especially if
> we can automatically alway choose 'theirs'. This would completely
> fix my current problem... but, before then - is there anyway to do
> this with 1.4?
> Thanks! M@

You can mimic this behaviour by specifying an alternative merge
programme. Doing something like

svn merge --diff3-cmd=svnmergetheirs ...

where svnmergetheirs is a shell script doing nothing but

cat ${11}

should suffice, see
for other arguments you may use.


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-17 13:14: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.