Where are we with merge procedure? What's the workflow we want to see for master -> 1.3.1?
1.3.1 is cut from 1.3.x I assume. But you asked a lot of questions about how to make it easier to see the differences. The best I could come up with to satisfy your question would have been to insist that *every single commit* on master be a merge commit and that those same merged heads could be merged to 1.3.x. That would, I think, make a log like "--first-parent 1.3.x..master" show only the ones that haven't been backported (I think). I already applied at least one fix via cherry-picking. I'll put it in CHANGES. On Fri, May 17, 2013 at 4:51 AM, Noah Slater <[email protected]> wrote: > Friendly bump. > > NEWS and CHANGES are still empty. > > I'll be calling the vote on 1.3.1 in 12 days, so y'all better get your > changes in pronto! ;) > > > On 15 May 2013 07:24, Dave Cottlehuber <[email protected]> wrote: > >> On 15 May 2013 06:17, Benoit Chesneau <[email protected]> wrote: >> > On May 15, 2013 12:06 AM, "Dave Cottlehuber" <[email protected]> wrote: >> >> >> >> On 14 May 2013 23:24, Robert Newson <[email protected]> wrote: >> >> > >> >> > I'd like to see the mochiweb work for R16 compatibility in 1.3.1. >> >> > >> >> > B. >> >> >> > >> > this can't happen since it removes the r13 compatibility. imo it has to >> > wait for 1.4. >> > >> > in the mean rime ws could port the patch from macport to give the >> > compatibility with r16... This parse_transform works well. >> > >> > - benoit >> >> Seems sensible. >> > > > > -- > NS
