Hi all,
We use Tortoise 1.6.3 and SVN 1.4.2.
We have a problem during the merging operation :
We want to merge all the components commited in one revision of a branch with the trunk, 3 scenarios :
- A component was added in the revision of the branch and the merge is correct ;
- A component was modified in the revision and it is present in the trunk, in this case I can choose during the merge opération between the modifications of my revision or those of the trunk ;
- On the last case I have a problem with components modified in the revision but not present in the trunk (We added those components in a prévious revision of the branch), I have during the merge opérationthe message "conflict in the arborescence ", I have the possibility to resolve the conflict, but he doesn't add the component in the trunk.
You are going to say me that I have to take the previous revision of the branch in which we added the component but ... I don't need the other components of this previous revision.
Have you a solution?
Should we upgrade our SVN (1.5 or later ??)?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2674633
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-22 14:58:19 CEST