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

RE: svn merge produced conflict with bad merge

From: Patrick Smears <patrick.smears_at_ensoft.co.uk>
Date: 2004-08-11 21:07:59 CEST

> I don't know the diff3 algorithm intimately, but I can hazard
> a guess as
> to what's happening in this specific case. The [_title] block is
> showing up in the 'working' area of the conflict because it's locally
> modified in the working file. It's not in direct conflict with the
> repository files (the repos files never changed that line), but it's
> probably shown anyway because it's "close enough" to the real
> conflicts,
> and thus falls within the 'troubled contextual region'.

Am I correct in my belief that the Subversion 3-way merge is a completely
new implementation, not based on RCS merge at all?

I _have_ seen instances in the past where RCS merge genuinely performed
3-way merges incorrectly, in a way that could have led to lost changes, if
it had not been spotted. (A colleague produced some small recipes that
demonstrated the problem, and was going to submit them to the RCS
developers; I don't know what became of that. The problem was intermittent,
in that merging identical files more than once could give different results
- suggesting some sort of uninitialised memory problem...). But if
Subversion's implementation is completely new, that's probably not


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 11 21:08:44 2004

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.