Help with branching.

I created a branch and have been doing what I thought to be successful merges from the trunk to keep the branch updated with changes.

Today however I noticed there was a file added to a directory in the trunk before Christmas, and it was not picked up by the merge to the branch.

So I click on my Branch folder, click Merge - select Merge a range of revisions.
My url to merge from is the Trunk

I leave the Revision range to merge blank - because I thought this meant pick up anything that has not yet been merged. I don't need to specify a range here do I???

My working copy is my branch.

My merge depth is working copy.

So now I'm in the unfortunate position of not knowing why this process seems to have failed and what else I've missed in the whole updating my branch from the trunk since December. I can try to use WinMerge to get everything synchronised to a certain extent - but then I'm expecting I'll get all sorts of weird conflicts when I reintegrate my branch back to the trunk.

So looking at the trunk log - I can see a file was added 6 versions ago, but it just doesn't get picked up when I do the merge option.

I am using the client version 1.6.6 - but am not 100% confident that other developers are using the exact same version, and don't know what version the server is using. If this is the cause of the issue then it seems concerning that the different versions don't play well with one another in a multi developer environment (where it can be hard to keep everyone on the same version).

The other thing that has happened sometime was that I had a merge go haywire because I had to cancel it partway through and ended up having to delete two folders to get it back into a state where it would stop complaining about tree conflicts - I can't remember if this particular file in question was in one of those 2 folders.

Any help would be greatly appreciated - just when I thought this branching thing wasn't so scary after all I discover it hasn't been working as I expected!! :)

Thanks,
Jen

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-05 08:39:03 CET