Showing content from http://mail.python.org/pipermail/python-dev/attachments/20110226/cdbbfb6a/attachment.html below:
<div>A <a href="http://mercurial.selenic.com/wiki/Branch">Mercurial 'merge'</a> is simply a creation of another changeset, which has two parents: the current tip of the branch you're working on, and the changeset you are merging with.<br clear="all">
</div><div><br></div>~/santa<br>
<br><br><div class="gmail_quote">On Sat, Feb 26, 2011 at 10:23 AM, Barry Warsaw <span dir="ltr"><<a href="mailto:barry@python.org">barry@python.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im">On Feb 26, 2011, at 06:32 PM, Ãric Araujo wrote:<br>
<br>
>>> Named branches are exclusive, they can't be a subset of each other ;)<br>
><br>
>Actually, they can. Â Take the example of the Mercurial repo itself. They<br>
>fix bugs in the stable branch and add features in default. Â When they<br>
>merge stable into default and commit, default becomes a superset of<br>
>stable. Â That is to say, someone pulling default also gets the<br>
>changesets from stable that are ancestors of the merge changset. Â Or in<br>
>other words, if you check out default, you get all bug fixes from stable.<br>
<br>
</div>That makes sense, but correct me if I'm wrong, it's the 'merge' operation that<br>
made this happen, right? Â A merge essentially brings the changesets from one<br>
branch into another.<br>
<font color="#888888"><br>
-Barry<br>
</font><br>_______________________________________________<br>
Python-Dev mailing list<br>
<a href="mailto:Python-Dev@python.org">Python-Dev@python.org</a><br>
<a href="http://mail.python.org/mailman/listinfo/python-dev" target="_blank">http://mail.python.org/mailman/listinfo/python-dev</a><br>
Unsubscribe: <a href="http://mail.python.org/mailman/options/python-dev/santoso.wijaya%40gmail.com" target="_blank">http://mail.python.org/mailman/options/python-dev/santoso.wijaya%40gmail.com</a><br>
<br></blockquote></div><br>
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