> Bob,
>
> 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/<projectName>/private/Marshall/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.
If you already integrated it once, then you can't do it again, unless you took the proper precautions.
> 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.
BOb
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064020
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 21:11:16 CEST