[Python-Dev] Merges from 2.6 to 3.0? (original) (raw)

skip at pobox.com skip at pobox.com
Sat Aug 9 23:27:30 CEST 2008 

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

More information about the Python-Dev mailing list