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

On Saturday 26 March 2005 15:36, Josh Pieper wrote:

> Congratulations, you have discovered a bug in FSFS.  Fortunately, it
> was only in the parsing routines, so your repository is fully intact.
> The bug has been fixed in r13683 of Subversion's trunk and will
> hopefully be backported to a 1.1.x release.  In the meantime, I'm
> sending you privately a link to a fully functional dump of your
> repository.
>
> Sorry for the trouble it has caused you,
> Josh

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?

-- 
Saulius Gražulis
Visuomeninė organizacija "Atviras Kodas Lietuvai"
P.Vileišio g. 18
LT-10306 Vilnius
Lietuva (Lithuania)
tel/fax:      (+370-5)-210 40 05
mobilus:      (+370-684)-49802, (+370-614)-36366