[Python-Dev] Status of 3.2 in Hg repository?

Tim Delaney timothy.c.delaney at gmail.com
Thu Aug 22 00:23:01 CEST 2013


On 22 August 2013 05:34, Tim Peters <tim.peters at gmail.com> wrote:

> Anyone know a reason not to do:
>
> hg -y merge --tool=internal:fail 3.2
>
> instead?  I saw that idea on some Hg wiki.


That would be from
http://mercurial.selenic.com/wiki/TipsAndTricks#Keep_.22My.22_or_.22Their.22_files_when_doing_a_merge.
I think it's a perfectly reasonable approach.

I expanded on it a little to make it more general (to choose which parent
to discard) in
http://stackoverflow.com/questions/14984793/mercurial-close-default-branch-and-replace-with-a-named-branch-as-new-default/14991454#14991454
.

Tim Delaney
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20130822/3a9769a1/attachment.html>


More information about the Python-Dev mailing list