RE: Help with branching.
From: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 5 Jan 2010 09:45:17 -0500
>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.
Not if you are using 1.5 or newer... unless you want to cherry pick.
>My working copy is my branch.
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.
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".
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
This is an archived mail posted to the TortoiseSVN Users mailing list.