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

Re: OpenOffice.org has migrated to subversion

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 4 Feb 2009 14:01:35 -0500

On Wed, Feb 4, 2009 at 1:49 PM, Jens-Heiner Rechtien
<jens-heiner.rechtien_at_sun.com> wrote:

> 3) More often than not developers have to sync up to a newer milestones
> before they can finish their work, say in this case milestone
> DEV300_m41, that is revision 267170.
> $ cd WC
> $ svn merge ^trunk_at_267170

So as an example, how long does a merge like this typically take?

> 4) RE integrates the feature branch/CWS into the main code line
> $ svn co ^trunk
> $ svn merge --reintegrate ^cws/myfeature
> Actually, it's practically impossible to use --reintegrate due to
> subtree mergeinfo, so we have to fall back to

Are you using 1.5.5 client? It is a lot smarter about knowing when
that subtree mergeinfo is OK? Also, have you considered cleaning up
this mergeinfo? The 1.5.5 client also no longer creates it when
copy/rename happens, which should remove all of the incorrect creating
of subtree mergeinfo. Generally, if using 1.5.5, you should only have
subtree mergeinfo if you have done subtree merges.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-04 20:02:30 CET

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.