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

RE: how to merge two branches into a third?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-08-25 17:43:22 CEST

> -----Original Message-----
> From: jeff emminger [mailto:jemminger@gmail.com]
> Sent: Friday, August 25, 2006 11:06 AM
> To: users@subversion.tigris.org
> Subject: how to merge two branches into a third?
> hi list,
> i have a repo like so:
> svn/project/branches/A
> svn/project/branches/B
> i now need to create branch "C" that contains the changes
> from A and B.
> my first attempt was to create branch C from A, and then merge B into
> it, but this doesn't seem to be correct. is there a way to do this?

Sounds correct to me, but ancestry will influence the decision.

If B was branched from A, then create C from B and merge A into C.
If A was branched from B, then create C from A and merge B into C.
Or branch C from the common ancestor of A and B and merge A and B into
If your Subversion server is in Alabama and A and B are first cousins...
errr... never mind.

If there is no ancestry between A and B then use 'merge
--ignore-ancestry' to do the merge, in which case it doesn't matter
where you branch C from.


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA622

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 17:51:08 2006

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

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