At 4:02 PM -0600 11/29/99, Gilles Detillieux wrote:
>Oh, should I have asked for a vote on all the enhancements I've put in,
>or do votes for stuff in 3.2.0b1 also count for 3.1.4 if feasible?  I can
>say that I've tested my enhancements pretty carfully.

Uh oh, my secret's out. I haven't been enforcing a freeze for 3-1-x. 
I don't see it as a problem since most of the changes have been bug 
fixes or really minor things.

>My choice would be local_urls_only, because it is directly related to the
>local_urls option.  I'd like to backport this to 3.1.4, as it nicely
>dovetails with Alexis's changes.  I'd also like to merge GetLocal() and
>GetLocalUser(), as there's some duplication of code happening, both for
>the handling of local_default_doc (which I'd like to expand to use a
>string list), and because we'll now be calling GetLocal() from at least
>3 places, and needing to check GetLocalUser() at those same places.
>I think it makes sense, logically, to group the two into one function, or
>have one call the other.

OK, this makes sense. I'm a bit worried about the scope of these 
changes for a "bug fix" release though. The simplest solution for now 
is to forget expanding local_default_doc and to have GetLocal() call 
GetLocalUser(). I think this would involve the fewest changes.

>be manually added into defaults.cc in 3.2, but what about stuff where
>the codebase is similar enough?  Would a merge at this stage be asking
>for trouble, or would it mostly work out fine?  If it'd be a bother,
>I can probably fairly quickly go over my 3.1.4 changes and commit them
>to 3.2.0b1 as well.

At this point, I have no idea how well a merge would go. Fortunately, 
many of the changes haven't been to code that's moved in 3.2. (For 
example, if the code in the Document::RetrieveHTTP method changed, it 
could be a problem.)

The last time I did a merge though, the biggest conflicts were those 
pesky $Id: $ and $Log: $ tags, which wasn't a big deal.

-Geoff


------------------------------------
To unsubscribe from the htdig3-dev mailing list, send a message to
[EMAIL PROTECTED] 
You will receive a message to confirm this. 

Reply via email to