You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by jeff emminger <je...@gmail.com> on 2006/08/25 15:05:55 UTC

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?

thanks,
jeff

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: how to merge two branches into a third?

Posted by jeff emminger <je...@gmail.com>.
> > > On 8/25/06, Robert P. J. Day <rp...@mindspring.com> wrote:
> > > > On Fri, 25 Aug 2006, jeff emminger wrote:
> > > >
> > > > > 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.
> > > >
> > > > what do you mean "the changes from A and B"?  changes with respect to
> > > > what?

> > On Fri, 25 Aug 2006, jeff emminger wrote:
> > > ah - maybe that's it... with respect to trunk

> > if you want a new branch with the sum of changes from both of the
> > other branches, i'm guessing you'd just create your new branch "C" as
> > a copy of either A or B, and merge into it the changes that
> > accumulated on the other branch.
> >

On 8/25/06, jeff emminger <je...@gmail.com> wrote:
> well that's the problem.  i created C from A, then merged into C from
> the latest revision of B, and it said nothing was different.  I know
> there are differences, so i tried merging from the first to last
> revisions, and now there are a lot of conflicts, and using
> tortoisemerge to resolve the conflicts, it thinks the entire files are
> different when only a few lines are changed.  maybe i just don't
> understand svn's concept of merge.
>

or maybe do i need to merge each version of B into C, one at a time
from oldest to newest or vice-versa?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: how to merge two branches into a third?

Posted by "Robert P. J. Day" <rp...@mindspring.com>.
On Fri, 25 Aug 2006, jeff emminger wrote:

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

what do you mean "the changes from A and B"?  changes with respect to
what?

rday

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org