Martin> "Included", but not "available". The changes are in your "3.2
Martin> clone", but not in the "3.2 branch" of the "3.2 clone". Each
Martin> clone has all branches, even if you only "update" to one of
Martin> them.
Martin> So after "hg push", the change is on the "3.1 branch" of the
Martin> "3.2 clone". The "merge 3.1" tries to merge all changes on the
Martin> 3.1 branch that are not already on the 3.2 branch to the 3.2
Martin> branch.
Thanks, that's helpful.
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
