On Sunday 27 March 2005 04:32, Saulius Grazulis wrote:
[snip]
> 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.
Don't worry much. It's pretty rare to see the this condition.
> 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?
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.
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.
HTH.
-John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Mar 27 12:40:44 2005