you go to your checkout (default), you do hg merge <branch name> and then hg diff. if you don't like it, you do hg up -C to clean stuff up. Easy to do in a separate dir (I suggest hg share for that) On Tue, Jul 16, 2013 at 7:17 PM, Amaury Forgeot d'Arc <amauryfa@gmail.com> wrote:
I could do it. Is there a way to get a full diff of the changes about to be merged?
2013/7/16 Matti Picus <matti.picus@gmail.com>
The ndarray-branch passes tests both translated and untranslated. I ran it through the numpy test suite as well, specifically the matrix class tests, and it seems to pass them. Would anyone like to review, or should I just go ahead and merge? Specifically, I may have missed some w_ prefixes on app-level instances, or may not have tested all the code paths, and I had to hack the FakeSpace in compile.py to allow subclassing. Matti _______________________________________________ pypy-dev mailing list pypy-dev@python.org http://mail.python.org/mailman/listinfo/pypy-dev
-- Amaury Forgeot d'Arc
_______________________________________________ pypy-dev mailing list pypy-dev@python.org http://mail.python.org/mailman/listinfo/pypy-dev