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

Re: Merge tracking

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-04-07 13:22:33 CEST

Gino Marckx wrote:
> 2. When integrating, the changes on the child branch that result from the
> rebase action (and thus are coming from the parent branch) do not need to
> be integrated in the parent branch. Otherwise these changes will be
> duplicated.

If you have brought the branch up to date, i.e. you have rebased it up to the
current head revision, then integrating is simply equivalent to copying the
branch to the trunk. (The change that needs to be added to the trunk is simply
the current difference between trunk and branch.)

If you haven't yet brought the branch up to date, then there are likely to be
conflicts and you shouldn't be trying to integrate it.

So I don't see why you would need transitive merges etc. in this situation.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 7 13:23:31 2005

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