[Python-Dev] Merges from 2.6 to 3.0?

[skip at pobox.com]

    Georg> svnmerge stores information about merged and blocked revisions in
    Georg> SVN properties of the root directory.  In your case, you didn't
    Georg> commit the property change, so svnmerge doesn't assume 65605 as
    Georg> integrated yet.  If you still have the property change in your
    Georg> working copy, please commit it.

Ah, ok.  Done.  I guess I shouldn't have specified the files to commit.  I
should have committed everything.

Skip