On Jan 20, 2012 5:58 PM, "lkcl luke" <[email protected]> wrote:
>
> On Fri, Jan 20, 2012 at 10:23 PM, Pascal Chambon <[email protected]>
wrote:
> > Hello,
> >
> > I've finished merging Daniel Kluev's internal_ast branch with current
> > master, through manual patchs since work had diverged between
translator.py
> > and translator_proto.py.
> >
> > This resulted in quite  a silly mess, since the same parts of the
translator
> > had been improved in different ways by different contributors.
>
>  *sigh*.  now you know why i don't like branches.

Well in all fairness, a feature branch is suppose to regularly merge from
HEAD, and resolve tiny conflicts along the way ... then a final merge or
rebase back onto HEAD is simple.

This branch however, has been more or less unmaintained for 6+ months ...
am curious why, but w/e.

> > I've reached as slightly stable state (all test.py passing, and not too
many
> > errors when running libtest in browser), but I had lost tracks of what
tests
> > where supposed to pass and which weren't, in pyjamas repo.
>
>  if it's got a "#" number by it, it's fine.  otherwise it's not.  once
> you have all the ones that don't have "#" in front done, feel free to
> go ahead and commit it.

Yes I agree -- resolve what you can and push in ASAP, that way it's in,
doesn't get worse (ie eventually disregarded), and can be refined further.

--

C Anthony

Reply via email to