--- Dom 24/6/12, Lin Yuan <[email protected]> ha scritto:
> Da: Lin Yuan <[email protected]> > Oggetto: Re: [RELEASE][3.4.1]: proposing "Bug 118057 [filter] word 2003 XML > (wordml) filters broken" as release blocker > A: [email protected], [email protected] > Data: Domenica 24 giugno 2012, 22:18 > 2012/6/25 Pedro Giffuni <[email protected]> > > > Ugh ... > > > > --- Dom 24/6/12, De Bin Lei <[email protected]> > ha scritto: > > > > > Da: De Bin Lei <[email protected]> > > > Oggetto: Re: [RELEASE][3.4.1]: proposing "Bug > 118057 [filter] word 2003 > > XML (wordml) filters broken" as release blocker > > > A: [email protected] > > > Data: Domenica 24 giugno 2012, 20:14 > > > 2012/6/20 Jürgen Schmidt <[email protected]> > > > > > > > On 6/20/12 10:14 AM, debin lei wrote: > > > > > 2012/6/20 Jürgen Schmidt <[email protected]> > > > > > > > > > >> On 6/20/12 8:21 AM, debin lei > wrote: > > > > >>> +1 from my view. > > > > >>> I have checked the fix. It has a > very high > > > benefit to risk ratio it > > > > could > > > > >>> be good for AOO 3.4.1. > > > > >> > > > > >> fix available and reviewed, so it > looks fine > > > for me to include it for > > > > >> 3.4.1. > > > > >> > > > > >> Debin, Will you take care of the fix > for 3.4.1 > > > on the AOO34 branch ones > > > > >> you have the commit rights ;-) > > > > >> > > > > >> Ok, I will take care of the fix for > 3.4.1, > > > when I have the right. > > > > > > > > perfect, please add the revision of the > branch in the > > > issue when you > > > > have fixed it. It helps to track it. > > > > > > > > DONE. > > > The code have checked in 3.4.1 and revision is > 1353370. > > > > > > > I see the issue appears RESOLVED - FIXED. > > Was the issue fixed in trunk? > > > > > In general all fixes should go to trunk first. > > > > So the code changes in 3.4.1 branch will not be merged > to main trunk automaticly after 3.4.1 released? > Not "automatically": someone has to do it and if the bug is labelled "RESOLVED - FIXED" it's likely that someone will forget to do it. That's one of the reasons it's preferable to commit the patches to trunk first. Another reason is that using "svn merge" will keep track of the revisions that have been merged. Cheers, Pedro.
