[aseek-devel] Re: [cvs commit]: User matt, module aspseek

[Matt Sullivan]

Hi Kir,

On Fri, 23 Aug 2002, Kir Kolyshkin wrote:

> Matt, thank you for finding/fixing the bug!
>
> Please note that the policy of commiting the bug fixes is the following:
>
> 1. Write the one-line fix description into NEWS file in _stable_ branch.
> 2. Commit the patched files together with the NEWS into _stable_ branch.
> 3. Commit the patched files (but no NEWS file) into v_1_3 branch.
>
> [Actually you can do (3), and after that (1) and (2)]

Cool, my only reason for not commiting into HEAD was that we hadn't talked
about policy :)


> The reason is 1.2.x branch is not yet closed; seems we will release
> aspseek-1.2.11 some day before or after 1.3.0. The point of maintaining
> two branches is we are doing some development, while providing a stable
> version for users who need it for their production systems. I know this
> creates a CVS merging problem, but I will handle it.

Ok ;)


> So, please do (1) and 2, and if you have some more bug fixes that you
> have committed in v_1_3 and feel that it should be in 1.2.11, please
> commit them as well, together with the according NEWS additions.
>
> Sorry I haven't told you about it later.

No problem, will do.


Matt.

> [EMAIL PROTECTED] wrote:
> >
> > Module: aspseek
> > User:   matt
> > Date:   Thu Aug 22 22:23:03 PDT 2002
> >
> > ------------------- CVS Info -------------------
> > Update of /home/cvs/aspseek/src
> > In directory cvs.aspseek.org:/tmp/cvs-serv6296
> >
> > Modified Files:
> >       Tag: v_1_3
> >         resolve.cpp
> > Log Message:
> > fix problem where cancelling a running threaded index session
> > with ^C sends all resolvers into zombied state
> >
> > ------------------------------------------------
> >
> > View changes:
> > 
>http://cvs.aspseek.org/viewcvs/viewcvs.cgi/aspseek/src/resolve.cpp?r1=1.29&r2=1.29.4.1
>
> PS I have just found a tiny bug in the above line: file name should be 
>'resolve.cpp.diff',
> not 'resolve.cpp'. Fixed.
>
> -- [EMAIL PROTECTED] ICQ UIN 7551596 Phone +7 903 6722750 --
>    Guinness a Day Keeps a Doctor Away (people's wisdom)
>