> -----Original Message-----
> From: Tremal Naik [mailto:tremalnaik@gmail.com]
> Sent: vendredi, 1. décembre 2006 10:47
> To: Méresse Christophe
> Cc: users@subversion.tigris.org
> Subject: Re: Confused about merging
[snip]
> Well... I created the foobranch to make a major change to the project.
> When a 30% was done (and after testing it) I decided to port back to
> the trunk the work completed so far. So I merged the files back to the
> trunk using the TortoiseSVN procedure. I had no problem at all.
>
> But I didn't commit on the trunk immediately (I think this may be the
> cause of the problem) , I performed some changes on the freshly merged
> source on my working copy and then I committed it as revision 41.
>
> Now, I decided to port back to the foobar the changes on the source
> performed the step before (changes occurred after the merge, before
> the commit). But the situation described in my first post arose. Some
> files (probabily those changed in between the merge and the commit)
> conflicted.
>
> Any ideas?
OK:
trunk
|
foobranch---|
| |
| |
40 |
41 (= 40) 41 (Merged from foobranch + some modif.)
?
As I understand, to create "?", you should merge the diff between trunk@41 and foobranch@41 (or 40 it should be the same) to your foobranch.
In TortoiseSVN:
1- select the foobranch as From: with rev 41
2- select the trunk as To: with rev 41
You are in the "Merging Two Different Trees" case of TortoiseSVN documentation.
HTH
Christophe
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 1 11:40:11 2006