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

Re: 2-way merging - bad?

From: John Browne <jkbrowne_at_gmail.com>
Date: 2005-06-22 18:33:20 CEST

Thanks for the information. The thread in the third link above brings
me to another question. It mentions that the trunk is typically used
for enhancements and bugfixes, then changes ported to a specific
branch for releases. I always thought it was the other way
around.....maybe a branch such as "/branches/development" that was
ported back into the trunk, then the trunk is tagged and releases are
created from the trunk.

Or do I have it backwards? :)

On 6/22/05, Joshua Varner <jlvarner@gmail.com> wrote:
> On 6/22/05, Tim Blackman <Tim.Blackman@sun.com> wrote:
> > On Jun 22, 2005, at 12:58 AM, John Browne wrote:
> >
> > > Are there any "gotchas" with merging changes back and forth (2-way
> > > merging) between the trunk and a branch? The subversion book seems to
> > > imply that it's not a problem, but other things I've read say 2-way
> > > merging is bad.. Seems like if the developers are using "clean"
> > > working copies with no local mods when the merge occurs it should work
> > > fine.
> > >
> > > Any thoughts?
> >
> > Merges don't always take into account files that have been moved in the
> > branch or the trunk.
> >
> > - Tim
> >
>
> Here are some recent e-mails about it. I think the general consensus
> is that merging should occur in only one direction at a time, unless
> you want to spend the extra time to coordinate the changes b/w the
> developers.
>
> http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=33634
> http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=33078
> http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=31725
>
> svk and arch handle this a little better since it is more fundamental
> to the distributed VC systems, so if it is necessary for you, you
> might take a look at those.
>
> Josh
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 22 18:45:44 2005

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