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

On Sunday 27 March 2005 12:34, John Szakmeister wrote:

> > 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.
>
> Don't worry much.  It's pretty rare to see the this condition.

Thanks for the message. Sounds reassuring :).

> 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.

Aha, so Phil will get the fix into text-time somewhere during the next week or
two, right?

> If you feel the need to have it *right now*, then you should probably
> merge the change in yourself.  Just watch out for when he does the weekly
> sync, so you can revert your change before updating, and avoid
> conflicting.

Clear. I will have a look. Since, as you say, the problem manifests itself
seldomly, and we keep frequent backups of our repositories, I will probably
wait till Phil's changes appears in the fixed trunk, or download the patched
text-time banched. I will probably mess more things up than I fix by trying a
merge without properly understanding the code ;).

>
> HTH.

Thanks for the info, its very helpful.

-- 
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