On Jan 10, 2008, at 13:03, Hielke Hoeve wrote:
> On 10/01/2008, Felipe, Ramon <ramon.felipe_at_wamu.net> wrote:
>> I've read the manual but according to the manual, when branching
>> between
>> 2 trees, the TO and FROM must contain the 2 trees I'm merging. The
>> manual says that the FROM field should be the trunk URL and the TO
>> field
>> should contain the branch URL.
>
> Then this is wrong. When I merge changes made on branch A between
> revision 1 and (say) 7 to branch B I do the following.
>
> 1. Select Merge on the folder containing branch B.
> 2. From URL: Branch A, revision 1.
> 3. TO URL: Branch A, revision 7.
> 4. Merge.
On Jan 10, 2008, at 19:53, Felipe, Ramon wrote:
> So here's what I did.
>
> 1. Create a project repository with trunks, branches, tags folders.
> 2. Create project1 folder under trunk with 1 file called file1.txt
> 3. Create branch from folder1 under branches folder.
> 4. Modify line 1 on file1.txt under trunk. Commit.
> 5. Modify line2 on file1.txt under branches. Commit.
>
> So the scenario is 2 developers working concurrently on trunk and
> branch
> folder. Now the branch, let's say a feature branch that developer 1 is
> working on, is ready to be merged back to trunk (being worked on by
> developer 2.)
>
> I thought the process would be, as it said in the manual, merging 2
> trees. So...
>
> 1. I right click on the trunk/folder1 folder. Select Merge.
> 2. Enter the URL for trunk/folder1 in the FROM field, HEAD revision.
> 3. Uncheck "Use From URL..." checkbox and enter the branch URL in
> the TO
> field (http... branches/folder1) HEAD revision.
If you read Hielke's description above, you may notice that the you're
doing it differently. Here's what you are asking tortoisesvn to do:
"Please make the changes necessary to get [FROM] the head revision of
the trunk [TO] the head revision of the branch to my working copy (of
the trunk)."
This is precisely what subversion has done: It has applied the
necessary changes to make your working copy of the trunk identical to
the branch. This is almost certainly not what you want.
What Hielke asking is quite different.
"Please make the changes necessary to get [FROM] revision 1 of branch
A [TO] revision 7 of branch A to my working copy (of branch B)."
Merging confused me too the first few times.
HTH
Ben
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-10 21:34:11 CET