Re: Problem with merge and --reintegrate

> This is exactly what we do, and what we experienced. My advice is, upgrade to 1.6.3 server and clients immediately. Then run svn propdel -R svn:mergeinfo across every branch, but being careful to revert the root folder's merge info before checking in. This cleans up all the crappy per file mergeinfo left behind by early buggy versions of 1.5. After these steps you should find that everything works pretty sweetly, with mergeinfo only being recorded on the root folder. Its so easy to let per file mergeinfo creep back in, and its a constant battle to keep the bloody stuff at bay (especially given all the per file patchup merges that typically have to be done when files and folders move around - in that case I use --ignore-ancestry which stops mergeinfo from being written).
>
> That's what we did anyway, and life got immeasurably better.

Ok. Thanks for your input.

> One question though. Surely you'll want to cherry pick from the trunk occasionally? What if someone fixes a bug there during general dev that's appropriate for the release?

Ya, I guess. We just haven't done it yet. On the other hand, if you are
supposed to fix a bug, isn't it better to fix it in the oldest maintained
branch and then merge it back intro trunk from there?

-- 
Rickard Lindberg
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2375180
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].