On Wed, Jun 16, 2010 at 10:25, Fausto Carvalho Marques SIlva <fau...@tse.gov.br> wrote: > I have a 1.4 repository with 9000 revisions and a size of 1GB, i want to use > the "merge reintegrate" option, so i have to upgrade the repository to the > new layout. When i do a dump and a load the reintegrate works fine, but when > i do a "svnadmin upgrade" the reintegrate does not work, it keeps > generating so many conflicts that does not occur when dumping and loading > the repository. Can someone help me!
svn merge --reintegrate is new with Subversion 1.5 as part of the Merge Tracking support. You need 1.5 clients, server, and the repository upgraded to 1.5 compatibility. Have you upgraded to at least 1.5 across the board? It's not clear from your message.
