[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: Marshall <mamills.gseit_at_gmail.com>
Date: Thu, 5 Sep 2013 11:25:40 -0700 (PDT)


Many thanks for your time assisting me.

> > Hey Bob,
> >
> > >Generally, you will use Reintegrate. This is usually for the feature branch use case.
> > >In 1.8.x you don't have to make the choice, svn will figure it out for you.
> >
> > I ran "merge reintegrate..." on my trunk working copy and it failed. It tried to
> > merge some very old branch, one in fact that another developer had used.
> > . . .
> > Yesterday when I mentioned I synchronized my branch with the trunk, the branch that got synchronized was something like https://<redacted​>/svn/<project​Name>/private/Mar​shall/bugfix12345
> Before doing a re-integrate you need to merge trunk into branch. What re-integrate does it find differences between the HEAD of trunk and the HEAD of branch (not 100% true all the time). It then figures out the diff and applies it to your target.
> I assume that old branch was made from trunk? If you look at the log can you verify the trunk is it's ancestor?
> The longer a branch goes without being merged back, the harder it will be to merge back. Looks like you had a tree conflict on your merge.
> BOb

Yep, I did a "merge trunk into branch"; that's what I had called "synchronized my branch with the trunk".

Yep, that old branch was made from the trunk. The old branch was created on Sep 30 2011 , and reintegrated back into the trunk on Oct 28 2011.

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..."?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 20:25:43 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.