[EMAIL PROTECTED] schrieb:
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.
Yep; thankfully svnmerge makes sure the working copy is clean before merging. 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. _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
