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

Re: Do we need to store redundant mergeinfo?

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 10 Nov 2011 14:45:40 -0500

On Thu, Nov 10, 2011 at 1:13 PM, Philip Martin

> > This statement is not true. You can still merge BranchA to BranchC in
> the
> > above scenario. SVN does not have any limits on where you can merge from
> > and to.
> Yes, Subversion allows one do it, but it doesn't work reliably. It's
> the standard cyclic merge problem. If we mix merges that go A-to-B-to-C
> with merges from A-to-C then conflicts can occur. You must know this:

Yes I am aware that the cyclic merge issues would apply here as they do
elsewhere, but that is different than saying we do not support these
scenarios. Even in the cyclic merge scenario Subversion is not preventing
you from doing a merge, it is simply not doing it as well as one could hope
it would and leads to conflicts that you should not have to resolve.

Mark Phippard
Received on 2011-11-10 20:46:12 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.