Re: Merging Branch to Trunk takes 20 min for one change

Stefan - thanks for the info. I should have said we are using Google
Code. I believe Google currently uses version 1.6.

Afaik all merges have been done using Tortoise SVN via Windows
Interface (right click,select Merge). However some may have been done
prior to version 1.5. But I don't think we have ever removed merginfo
properties.

In the last merge I tried (from branch to trunk), many files appeared
as modified, although diff shows no changes between the files. I read
another post here about this issue which was related to version 1.5?
Is that correct? I have not committed that merge to trunk yet. Should
I? Or should I revert it and do the dump/load cycle first and then
redo the merge?

Will a dump/load cycle correct all the above problems? And how do I
ensure no one is removing mergeinfo properties?

Thanks again for all the assistance.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2405307

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-08 22:44:41 CEST