Re: [Jython-dev] merging between 2.3 and trunk

[Frank W. <fwi...@gm...>]

On 6/5/07, Charlie Groves <cha...@gm...> wrote:
> Everything is merged from trunk to 2.3 up to 3186.  I also merged in
> 3228 since it was particularly nasty.  It looks like everything since
> 3186 except for Khalid's binascii patch should be pulled over.
Cool thanks.

> My method so far has been to just dump the merge command I ran into
> the commit message to use as a starting point when I merge the next
> time.
Okay.

> What does svnmerge.py do for you?
I've just been experimenting with it because I saw the CPython folks
discussing it wrt their own merges.  It looks like it keeps a record
of merges in an svn property, so that you can run simple commands to
get a feel for what has and hasn't been merged, and then merge a
little more automatically than with straight svn merge.  It looks like
it is easiest if you use it from the start of a branch though, so it
is probably too late for 2.3 (especially since I think 2.3 won't be
active too much longer).

Anyway, I plan to merge the trunk changes into 2.3 this week.

Thanks,

-Frank