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

RE: Re: Docs for reintegration unclear

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 6 Sep 2013 14:14:30 +0000

> >> Question: if multiple developers are working on a project with their
> >> own feature branches (copied from trunk of course); how does a fresh
> >> working copy of the trunk know which branch needs to be reintegrated
> >> when doing a "Merge reintegrate..."?
> >Well, you of course specify the merge source (the branch) and it determines if
> it is a reintegrate. Someone explained once on SVN list how it determines this...
> but I think it has to do with where stuff was copied from, etc.
> OK, I think there's a bug then. When I use "merge reintegrate..." it will never
> ask me what the merge source is. Neither does the documentation show any
> option to supply this information. Ref: TortoiseSVN-1.8.2-en.pdf section 4.20.7

What version of TSVN are you using?

In 1.7.x:

When you merge with TSVN the folder/working copy you right click on and select "merge" is the target. You would need to select "Reintegrate a branch". Next you select "From URL"... the From URL is the source I refer to. So, you are specifying the branch you are reintegrating. If you have already reintegrated that branch once, or merged from the branch to trunk earlier with a Merge Range or Merge Trees then your re-integrate is probably not going to go smoothly. If you want to keep a branch live after doing a reintegrate you have to do a record only merge back to branch from trunk the commit of the merge on trunk. If you don't do this and try to merge again you will get conflicts.

In 1.8.x:

Here you right click on the working copy and select "Merge a range of revisions" and svn will figure out if this is a reintegrate automatically. Then you would select your source (URL to merge from). Also, you can continue to use a branch in this case, since svn somehow figures out if you do a re-integrate again the right thing to do, you don't have to do the merge only record. I'm not sure how or what it does behind the scenes, but there you are.

So, svn can't know what devs stuff to merge in... because as I said, you always tell it your target and your source.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-06 16:14:37 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.