Re: [TSVN] RE: TortoiseSVN - FAQ

ECKHART.CURT wrote:
> 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?

No, definitely not. That would be _very_ dangerous (automatically
merging the changes from trunk). You have to merge in the changes
manually, using the merge dialog. And you will also have to remember the
revisions you already merged in, because if you don't you will end up
with "mutliple merges" which cause conflicts in your working copy.
See the Subversion book about that:
http://svnbook.red-bean.com/svnbook-1.1/ch04s03.html

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org