Continually increasing merge data on irrelevant files

Hi All,

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.

The repository set off as a 1.4 repo, got upgraded to 1.5 during 1.5's
RC phase and is now being used with the stock Ubuntu 9.04 build of
Subversion 1.5.4

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?

Thanks

jebw

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2363290

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-18 20:48:09 CEST