[Python-Dev] Merges from 2.6 to 3.0?

[Georg Brandl]

skip at pobox.com schrieb:
>     Guido> If you use svnmerge properly you won't have to block anything in
>     Guido> this case.
> 
> Let's assume I used it correctly.  (That, of course, remains to be seen.)
> What about the checkin I did will tell someone running svnmerge later that
> r65605 has already been merged to py3k?

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

Georg

-- 
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.