Showing content from http://mail.python.org/pipermail/python-dev/attachments/20110321/a22ea0bd/attachment.html below:
<div class="gmail_quote">On 21 March 2011 08:16, Tim Delaney <span dir="ltr"><<a href="mailto:timothy.c.delaney@gmail.com">timothy.c.delaney@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="gmail_quote"><div class="im"><br></div><div>For the second and later merges:</div>
<div><br></div><div><div>hg update 1234_merged_with_3.2</div><div>hg merge 3.2</div><div><div>hg commit -m "Merged 3.2 to 1234_merged_with_3.2"</div></div><div>hg merge 1234</div><div><div><div>hg commit -m "Merged 1234 to 1234_merged_with_3.2"</div>
</div></div></div></div></blockquote><div><br></div><div>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 ...</div>
<div><br></div><div>Tim Delaney </div></div>
RetroSearch is an open source project built by @garambo
| Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4