Thanks Daan. --Sheng
On Tue, Apr 22, 2014 at 1:46 PM, Daan Hoogland <daan.hoogl...@gmail.com>wrote: > Sheng, you are right. I will try to rename 4.4-forward and recreate > from 4.4. I didn't notice the older commits on the branch. > > On Tue, Apr 22, 2014 at 10:37 PM, Sheng Yang <sh...@yasker.org> wrote: > > Wait, MASTER is very difference from 4.4 branch which is feature freezed > > one month before. People are still working on MASTER for new features, I > > don't think it would be possible to kick out the commits not in 4.4 > branch. > > > > I would suggest save the commits in 4.4-forward, discard the current > > 4.4-forward branch and re-fork from 4.4 branch. > > > > It just has been 2 days and it's still fixable. Please don't wait until > > it's too late. > > > > --Sheng > > > > On Tue, Apr 22, 2014 at 1:05 AM, Daan Hoogland <daan.hoogl...@gmail.com > >wrote: > > > >> Well, I seem to have been forking master instead of 4.4. I am amending > >> this while writing this mail. Feel free to cherry-pick whatever is > >> needed to 4.4-forward. (but update/pull/fetch/rebase first) > >> > >> sorry for the inconvenience, > >> Daan > >> > >> On Tue, Apr 22, 2014 at 12:31 AM, Min Chen <min.c...@citrix.com> wrote: > >> > Sorry, typo. I meant to say that they are not in 4.4-forward. Now I > need > >> > to make a commit to 4.4-forward, and not sure if I need to pursue or > wait > >> > for your fix. > >> > > >> > Thanks > >> > -min > >> > > >> > On 4/21/14 3:26 PM, "Min Chen" <min.c...@citrix.com> wrote: > >> > > >> >>For example, all my commit after and including > >> >>563efad9aee29ea31f10381694c5b55791d561fc made on 4/17 is not there in > >> 4.4. > >> >> > >> >>Thanks > >> >>-min > >> >> > >> >>On 4/21/14 3:22 PM, "Min Chen" <min.c...@citrix.com> wrote: > >> >> > >> >>>Daan, > >> >>> > >> >>> How did you create 4.4-forward branch? I found that 4.4 branch > >> has a lot > >> >>>of commits that are not in 4.4-forward branch, and those commits are > >> made > >> >>>before code freeze date. > >> >>> > >> >>> Can you please double check? > >> >>> > >> >>> Thanks > >> >>> -min > >> >>> > >> >>>On 4/19/14 8:07 AM, "Daan Hoogland" <daan.hoogl...@gmail.com> wrote: > >> >>> > >> >>>>All, > >> >>>> > >> >>>>I created 4.4-forward. Please do all checkins for here on in on this > >> >>>>new branch. If you have a commit for a blocking issue, please > request > >> >>>>for it to be cherry-picked on the 4.4 branch on this list and use > the > >> >>>>[ACS44] tag. Hugo and I will distribute the work involved for this. > >> >>>> > >> >>>>kind regards, > >> >>>>-- > >> >>>>Daan > >> >>> > >> >> > >> > > >> > >> > >> > >> -- > >> Daan > >> > > > > -- > Daan >
