On Tue, 13 Aug 2013 00:42:25 +0300 Ezio Melotti <ezio.melo...@gmail.com> wrote: > > To avoid these big merges you can do: > # check the two heads that you are going to merge and their csids > hg heads . > # update to the other head (the one you pulled, not the one you committed) > hg up csid-of-the-other-head > # merge your changes on with the ones you pulled > hg merge > > This will merge the changes you just committed with the ones you > pulled, and result in a shorter diff that is easier to > read/review/merge. > Otherwise pulling and updating before committing will avoid the > problem entirely (unless you end up in a push-race).
Or, if you are working on a single branch and no-one is watching you, you can do "hg pull --rebase". Regards Antoine. _______________________________________________ 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
