[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [1.5] What are the differences between 17-HEAD and 17,18,22,23

From: Silver Zachara <silver.zachara_at_gmail.com>
Date: Thu, 17 Jul 2008 19:23:09 +0200

Stefan Küng napsal(a):
> Silver Zachara wrote:
>> Hi list,
>>
>> I really need help now! I have project which have 2 branches. First
>> is to be sure the trunk and the second is the maintaince branch
>> v2.1.0. I have the reposity with Merge tracking support, thus I am
>> using svn server v1.5 and TortoiseSVN 1.5 x64bit.
>> Now I need to port changes from the trunk to the my maintaince branch
>> v2.1.0. (I have readed whole help about Merging features) For my
>> purposes in accordance with the Help is the best solution Merge a
>> range of revisions
>> The revisions in the trunk are 17,18,22,23 (in the 15 revision I have
>> created my maintaince branch v2.1.0).
>> And I explain my problem now.
>> When I enter 17,18,22,23 to the input Revision range to merge - in
>> the Merge revision range dialog and in the next step I try Test merge
>> I get this result: Conflicted:2 and Updated:26. But when I enter
>> 17-HEAD or 17-23 as a Revision range I get different result:
>> Conflicted:1 and Updated:23.
>> So which method is right (correct) and why I get different results ?
>>
>> Can anybody help me ? Because I don't continue in my work, I need
>> merge my trunk to the branch.
>
> Are the results from a test merge? Or did you really execute the merge?
> Because a test merge can show wrong output, especially if the same
> file was changed in multiple revisions (that will most likely show a
> 'conflict' in the test merge, but not necessarily in the real merge).
>
> Also, if you specify 17-HEAD, Subversion can better determine whether
> changes interfere than if you specify each revision separately.
>
> Stefan
>
Yes the results are only from a test merge. Idon't execute the merge.
So 17-HEAD is better way how can I merge my branch to the trunk ? I
answer myself :) I think that yes.
I try execute a merge now.

-- 
-------------------------------------------------------------------
                      --== Silver Zachara ==--
- pgp - http://radeonvmod.ic.cz/keys/silver.zachara@gmail.com.asc -
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-17 19:23:16 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.