Due to blocked merges etc. I expect that some names appearing in the 2.6
ACKS file aren't in the 3.0 ACKS file.  And possible the other way
around where backports are involved.  I like this file to be as
inclusive as possible (hey, my dad is in it :-) so perhaps the best
approach is to just make them both the union of what they currently are.

I merged them with a script I wrote (and attached.)

Thanks! :)

Since the ACKS have changed since I did this merge, shall I remerge and
commit the changes to both branches?

Yes, please sync the ACKS files again.

Commited in r61913 and r61914.

For the record

You don't have to merge changes from 2.6 to 3.0 manually. In fact you
mustn't unless you explicitly block the revision with svnmerge.py. In
general you submit a change to 2.6 and it gets merged into 3.0 later.

On Tue, Mar 25, 2008 at 4:17 PM, Christian Heimes <report@bugs.python.org>
wrote:

>
> Christian Heimes <lists@cheimes.de> added the comment:
>
> For the record
>
> You don't have to merge changes from 2.6 to 3.0 manually. In fact you
> mustn't unless you explicitly block the revision with svnmerge.py. In
> general you submit a change to 2.6 and it gets merged into 3.0 later.

Thanks for the heads up. Should I block the revision then?

>
>
> __________________________________
> Tracker <report@bugs.python.org>
> <http://bugs.python.org/issue2390>
> __________________________________
>

I think I'll follow a different path here. I may end up with

svn rm Misc/ACKS 
svn copy ../trunk/Misc/ACKS Misc/

It should make future merges easier.

On Tue, Mar 25, 2008 at 4:23 PM, Christian Heimes <report@bugs.python.org>
wrote:

>
> Christian Heimes <lists@cheimes.de> added the comment:
>
> I think I'll follow a different path here. I may end up with
>
> svn rm Misc/ACKS
> svn copy ../trunk/Misc/ACKS Misc/

That's what I did. They are exactly the same file.

>
>
> It should make future merges easier.
>
> __________________________________
> Tracker <report@bugs.python.org>
> <http://bugs.python.org/issue2390>
> __________________________________
>

Are you absolutely sure you have used "svn copy"? The logs don't show a
svn copy.

On Tue, Mar 25, 2008 at 4:29 PM, Christian Heimes <report@bugs.python.org>
wrote:

>
> Christian Heimes <lists@cheimes.de> added the comment:
>
> Are you absolutely sure you have used "svn copy"? The logs don't show a
> svn copy.

Oh, no. I copied with cp, so svn doesn't know about it.

>
>
> __________________________________
> Tracker <report@bugs.python.org>
> <http://bugs.python.org/issue2390>
> __________________________________
>