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

Re: Continually increasing merge data on irrelevant files

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Thu, 18 Jun 2009 11:52:17 -0700

On Thu, Jun 18, 2009 at 07:46:13PM +0100, Jeremy Wilkins wrote:
> I've got a 1.5 repository with several feature branches, these get
> merged to trunk. That gets merged with a testing branch. That in turn
> gets merged into a deployment branch.
>
> What I'm finding is that certain files which aren't being modified are
> continually getting merge data added to them. Its not added when the
> feature branch goes to trunk but trunk -> testing and testing ->
> deploy both add this merge data each time. Its always the same set of
> files.

This has been discussed three times in the past week. Please check the
archives.

> I'm assuming that this is some bug caused by an error in the
> repository, in which case how do I correct this? Would a dump/restore
> fix it or should I be upgrading to Subversion 1.6?

This is expected (if sometimes annoying/inconvenient) merge behavior.

tyler
Received on 2009-06-18 20:53:09 CEST

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