[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: <philipp.marek_at_bmlv.gv.at>
Date: 2005-03-28 12:04:04 CEST

Saulius Grazulis wrote:
> Great to hear this, I am impressed how fast the things get fixed here! :)
>
> Now, I am a bit worried about my repositories since I use FSFS, but I am
> currently running Phil's text-time branch (r13350q), and we are very happy
> with this functionality and rely on it.
>
> Now, staying on this branch, I will obviously miss your fix which I, ehh,
> would not like.
>
> Is there a chance that meta-data-versioning gets merged into the trunk, or do
> I need to merge it into my copy? The problem with merging is that it starts
> generating conflicts that need to be fixed manually, an the more the trunk
> changes, the more conflicts will emerge...
>
> I guess meta-data-versioning is quite usefull to many, and seems pretty
> stable
> at the moment.
>
> How should one proceed in such case?
As I'm using svk (for offline-support) it's just a "svk up -sm" for me to get
*locally* merged versions. Maybe that'd be a solution for you.

IIUC, I shall not merge my branches to trunk, as that would clutter the branch.

Max Bowsher wrote:
> Seemingly stable or not, it's still just a candidate patch.
> You've backed yourself into an unpleasant corner here, relying on a feature
> that is still quite some way from integration.
>
> Even worse, you are using a branch based on trunk, which we do NOT
> recommend for production use.
Well, I had patches off the latest stable release, but was asked to work off
trunk - now I read that basing on trunk is not recommended :-)

Saulius, I'll send you a patch tomorrow that applies to the current trunk.
Apply this to a trunk-checkout, and you'll be fine.
(That's what my patches/ directory was for, you know =-/)

Hope that helps!

And BTW, how about merging at the text-time-branch for 1.2 or 1.2.1? If
everybody who ever contacted me about this uses my branch, it should be very
much tested by now.
(Same for the full meta-data-versioning; it has changes in the same locations as
text-time, only the property names and uses are different).

And for the request about a design-document for my branches: does the old
doc-patch at
http://subversion.tigris.org/servlets/GetAttachment?list=dev&msgId=502715&attachId=2
 help? I know that is has not much details, but that's how it works.
(Simple substitution of property values as commit/import time, using them for
update/checkout/export)

Regards,

Phil

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 28 12:10:33 2005

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