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

Re: Including fixes to FSFS into meta-data-versioning? [Was: Re: PLEASE Help with Repository CORRUPTION!]

From: John Szakmeister <john_at_szakmeister.net>
Date: 2005-03-27 16:39:45 CEST

On Sunday 27 March 2005 09:29, Max Bowsher wrote:
> John Szakmeister wrote:
> > IIRC, Phil will be merging changes from trunk on roughly a weekly
> > basis. This is so that when it's time to merge, all the conflicts
> > will already have been taken care of. This is enforced in any way,
> > so he may take a little longer, or perform it at a different
> > interval.
> Sorry, but in this case you remember incorrectly. The locking and ruby
> branches were undergoing periodic merges, but no others were.
> Moreover, I don't think the text-time branch should be undergoing
> merges at this point. Better that it remain quiet and contain just the
> relevant feature changes until a suitable amount of integration effort
> can be applied to it post-1.2.

Yep, you're right. I was think about the various merges that I saw, but
that was just cherry-picking particular revs. Sorry for the confusion.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Mar 27 16:45:38 2005

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.