Thanks for your answer.
So, just to clarify, you're trying to merge a change to foo.c onto trunk, when foo.c was added in the branch (and not yet merged onto the trunk)?
That's right, but when foo.c was added on the branch in a revision, there was others components in this revision that I don't need in the trunk.
So, for you the only solution is to merge also this révision onto the trunk, isn't it ? We can't resolve "conflict in the arborescence" anyway with another solution ?
De : Daniel Becroft [mailto:djcbecroft_at_gmail.com]
Envoyé : lundi 25 octobre 2010 04:23
À : users
Cc : Mise en production
Objet : Re: Problem with merging in local copy
On Fri, Oct 22, 2010 at 10:58 PM, BAILLIET Sebastien <Sebastien.BAILLIET_at_cimut.fr<mailto:Sebastien.BAILLIET_at_cimut.fr>> wrote:
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.
So, just to clarify, you're trying to merge a change to foo.c onto trunk, when foo.c was added in the branch (and not yet merged onto the trunk)?
You'll need to merge the change to add foo.c onto the trunk as well.
Cheers,
Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2676541
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-28 14:33:48 CEST