RE: 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???
>

Not if you are using 1.5 or newer... unless you want to cherry pick.

>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.

If you look at the properties on the branch do you see the revision of the trunk that contains this new file listed?

I can think of two things that might have cause this...

1. The person that merged in the revisions with the new file in question didn't commit that new file for some reason.

2. The file was deleted from the branch after it was merged in for some reason.

Figure out which commit included the merge from the trunk that should have contained this new file... then check the change log to see if that file was added during the commit of the merge on branch.

>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).

It is possible to create some server side hooks to make sure commits come from a client that supports certain features. You can read the svn book for more info on this.

>
>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.

You might want to look in the svn book about tree-conflicts. Svn 1.6 can detect them but it can't resolve them. If you modified the tree in trunk and try to do a merge you will probably get a tree conflict. You resolve that by manually creating/deleting folders in the merge target. This is what is expected... it is not "going haywire".

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-05 15:45:27 CET