On Wed, Mar 16, 2011 at 7:09 PM, Nick Coghlan <ncogh...@gmail.com> wrote: > 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.
Having tried this, I advise against anyone else trying it. I seem to have got my local repo into a state where it thinks I have already merged something from 3.2 to default when I really haven't. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia _______________________________________________ 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
