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

RE: Merging headache

From: David Aldrich <David.Aldrich_at_EMEA.NEC.COM>
Date: Wed, 19 Sep 2012 08:19:59 +0000

Hi Stefan

Thanks very much for your advice, I will take careful note of it.

> BTW, I'm curious why you're getting an svn:mergeinfo conflict.
> That should never happen if you follow best practices.
> Is this common in your environment? If so, it seems people must be doing
> something quite wrong, but I don't really know what it could be. Are people
> editing mergeinfo by hand or gratuitously deleting it?

I really don't know why this has happened. AFAIK we never edit mergeinfo by hand.

As this is rather a mess, can you suggest a way to get back to some degree of order?


Received on 2012-09-19 10:21:06 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.