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

[TSVN] RE: TortoiseSVN - FAQ

From: ECKHART.CURT <ECKHART.CURT_at_leg.state.fl.us>
Date: 2004-11-09 17:36:11 CET

I will start out to say that I have read all of the SVN and TSVN
documentation several times, so if the answer to this question is in
there, I've missed it several times.

I've sucessfully built a branch and merged it back into the trunk, but
my question relates to change flow in the other direction. As I work my
branch, do changes occurring in the trunk flow out to my branch
automatically, or do I need to do some kind of action to get those
changes?

Is this even an issue? I understand the mechanics of SVN, but I still
don't have a lot of experience using it in a real world environment. If
one of you who work with SVN day to day would bring the nube (me) up to
speed, I'd appreciate it.

If there is a documented answer to this question, just slap my wrist and
direct me to it. :-)

TIA,
Curt Eckhart
The Florida Legislature

-----Original Message-----
From: Duncan Booth [mailto:duncan.booth@suttoncourtenay.org.uk]
Sent: Tuesday, November 09, 2004 8:08 AM
To: dev@tortoisesvn.tigris.org
Subject: Re: TortoiseSVN - FAQ

Pete Townsend wrote:

> User: Pete Townsend, mailto:p@postmaster.co.uk
> Categories: Daily use
>
> How does one use the merge feature in tortoise svn? I am trying to
merge
> from a branch into the trunk. In the merge dialog I have the brank url
> in the from field and use the latest revision number and in the to
> field I have the trunk url and merge to the head revision. What am I
> doing wrong?

Checkout the trunk.

In the 'from' field you specify the branch and the revision number where

the branch was created.
In the 'to' field you specify the branch and the HEAD revision.

This would merge changes applied 'from' the creation of the branch 'to'
to
current head of the branch into the sources you have checked out. i.e.
from
and to are describing a range of edits. 'First revision', 'last
revision'
might be better terms.

If you then edit the branch further, next time you need to specify the
first and last revisions on the branch which have not yet been merged,
so
make sure that when you check the merged copy into the trunk you record
what you have merged previously. e.g. 'merged revisions 7000 to 7200
from
mybranch into trunk' then next time you can work out that your 'from'
will
be revision 7201.

Intuitive it isn't.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Nov 9 17:36:36 2004

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