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
_______________________________________________
Python-Dev mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
