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

[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 18:37:34 +0200

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.

I will be thankful for any suggestion and reaction.

-- 
-------------------------------------------------------------------
                      --== 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 18:37:46 CEST

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