Trunk to branch merge - file lock error

I'm trying to update my branch with revisions to the trunk. I have been remiss with updating my branch and I have many revisions to merge from trunk.

After I merged a few revisions successfully, I hit revision 1434, where another developer inadvertently committed a lower-case bin folder alongside the existing init capped Bin folder. When I attempted the merge of 1434 into my branch, Tortoise complained about a file lock on the "bin" folder. Apparently, this is due to Windows being case insensitive, while SVN is case sensitive. That's all fine and good, but how do I resolve this in my working copy. I have many more revisions to merge so I need to be able to force the process along. In later revisions to trunk, the bin folders are deleted altogether.

I can't believe that I'm completely sunk at this point, but I can't figure out how to proceed past this lock error in my working copy. NOTE: as a temp workaround, I deleted the existing Bin folder using File Explorer, then ran the merge using revision 1434 again. It worked and created a "bin" folder and marked it as needing to be added to my branch. When I ran the merge for 1435, it bombed again on the "bin" file lock, even though none of the files in revision 1435 had anything to do with the "bin" folder.

I felt reasonably comfortable with TortoiseSVN until starting to merge. I don't want to screw anything up and have problems when I go to merge my branch back into the trunk. Any recommendations on how to proceed?

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-04 18:01:02 CEST