As I'm sure there will be plenty of erring as we get used to Hg: http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html
For simple cases of attempting to push a single commit that gets rejected by the server, hg rollback/hg pull/hg commit/hg push/ may provide a cleaner history than doing a dummy merge. hg backout also further emphasises the benefits of working in feature branches - I was able to revert the default branch in my sandbox to match upstream by backing out a single changeset. Cheers, Nick. -- Nick Coghlan | [email protected] | Brisbane, Australia _______________________________________________ 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
