In a message of Fri, 20 Jun 2008 08:54:24 +0200, Armin Rigo writes:

Hi Laura,

On Fri, Jun 20, 2008 at 05:17:10AM +0200, Laura Creighton wrote:

...

Do we have a tool that does this?

Not that I know of. I don't even really know the svnmerge.py he is talking about and we haven't used it in the pypy repository as far as I am aware.

Armin

Ah, well I was confused. But it turns out so was he, and the tool he wants already comes with svn. Laura