On 21 March 2011 08:16, Tim Delaney <timothy.c.delaney at gmail.com> wrote: >> For the second and later merges: >> hg update 1234_merged_with_3.2 > hg merge 3.2 > hg commit -m "Merged 3.2 to 1234_merged_with_3.2" > hg merge 1234 > hg commit -m "Merged 1234 to 1234_merged_with_3.2" > Of course, you should probably do the "hg merge 1234" before "hg merge 3.2" to avert the case that you actually "hg update 1234" here ... Tim Delaney -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://mail.python.org/pipermail/python-dev/attachments/20110321/a22ea0bd/attachment.html>