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

RE: Re: svn 1.5 merge -c revision and svn diff/log confusion

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 30 Oct 2009 10:27:28 -0400

> > Thank you for the explantation. It helps me understand 1.5.x
> mergeinfo.
> >
> > Maybe developers of subversion should write
> > that 1.5.x is not recommended for using in
> > a production system.
>
> We've been using 1.5 in production all year without problems.
>
> Two points.
>
> 1. The merge data doesn't hurt anything (some perf issues that are to
> be resolved in 1.7). As someone else already said if you merge from the
> root project folder the merge info won't propagate to all the child
> files and folders. In other words always merge to /trunk as the target
> from the branches root.
>
> 2. If you are merging in from a temporary branch that will be deleted,
> you don't really need the merge info on trunk. So after you do your
> merge, revert all the mergeinfo before you commit the merge.
>

3. Rather than doing branches and merging create a patch from your work PC, and email it to your home PC, and then vice versa.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2413012

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-30 15:28:29 CET

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