Code review comment for lp:~robert-kern/ipython/pretty

Revision history for this message
Fernando Perez (fdo.perez) wrote :

OK, go for it. Your doctests don't run yet even with my branch, but that's because I have a bug in handling multiline ipython inputs. Don't worry about that, let's merge this now, while I fix that issue in my branch. The tests will then get automatically picked up (I'll update with your fixes when you merge, and will make sure I pick them up correctly).

Thanks!

Robert: feel free to merge yourself if you want. I think only a *few* of us in the ~ip-dev team should be actually doing merges, to avoid possible problems with merge history. We should have a 'mergers' informally defined group and mentor people in for merge-into-trunk work gradually, but you have enough experience with all this game (more than me :), that I think it's fair to say that you're part of said informally defined group.

We should probably discuss on list this to have an explicit policy, on who handles the final merge steps, since it's the one place where there's a chance for conflicts or history problems to appear if many people try to do it simultaneously...

Anyway, that's a topic for the list. Merge away, making sure you have fully updated from trunk first.

review: Approve

« Back to merge proposal