Date: Sat, 10 Aug 2013 09:00:12 +0530 From: Sayantan Datta <std2048@...il.com> To: john-dev@...ts.openwall.com Subject: Re: Mask mode integration with bleeding. On Sat, Aug 10, 2013 at 12:22 AM, magnum <john.magnum@...hmail.com> wrote: > On 9 Aug, 2013, at 19:16 , Sayantan Datta <std2048@...il.com> wrote: > > On Fri, Aug 9, 2013 at 2:05 PM, Solar Designer <solar@...nwall.com> > wrote: > >> I like this approach. The only reason why I did not suggest it is that > >> it may be more work for Sayantan, but since Sayantan himself proposes > >> it, let's do it. > > > > magnum: I have forked a new repo bleeding-mask. Will you please push the > future core changes to this repo as well when you push to main-bleeding? > > Will you revert your problematic commits that are now present in > bleeding-jumbo or should I do it? We need to do this *now* before things > diverge out of control. Actually, I think you should do this: > > 1. revert each problematic commit from bleeding-jumbo > 2. merge bleeding-jumbo into bleeding-mask > 3. cherry-pick the same commits to bleeding-mask so they now appear only > in that branch. > > From that point on, we'll be able to merge anything from bleeding-jumbo > into bleeding-mask with little problems even though the branches will > diverge. > > If you don't feel confident with this I can do it for you. Just hold off > from committing anything for now and supply me a list of the commits to > revert (in short hash form, eg. 0965d1a). Or should I revert any commits > you have made from a certain date/time on? > > magnum > Thank you. Here's the list but as you said I want them to be in bleeding-mask. Also I haven't included any core changes that I have made in bleeding-jumbo to the list, most likely they won't cause any problems. 6c0d209 8e2043e 70b1148 d6cd0fe a4f7e0e 189fe11 c94ab2f 74d8657 c63b018 cfa8001 5f10770 ea91365 3f35abf dfdbc59 1a867bd e258bb8 f934f43e Regards, Sayantan Content of type "text/html" skipped
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.