> > > On 8/25/06, Robert P. J. Day <rpjday@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 <jemminger@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
Received on Fri Aug 25 17:40:22 2006