[prev in list] [next in list] [prev in thread] [next in thread]
List: python-dev
Subject: Re: [Python-Dev] Mercurial conversion repositories
From: Santoso Wijaya <santoso.wijaya () gmail ! com>
Date: 2011-02-26 18:54:00
Message-ID: AANLkTinHJE-RLBhTkEECXVQq8P0bPv5ysL8c=OLTR1cZ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
A Mercurial 'merge' <http://mercurial.selenic.com/wiki/Branch> is simply a
creation of another changeset, which has two parents: the current tip of th=
e
branch you're working on, and the changeset you are merging with.
~/santa
On Sat, Feb 26, 2011 at 10:23 AM, Barry Warsaw <barry@python.org> wrote:
> On Feb 26, 2011, at 06:32 PM, =C3=89ric Araujo wrote:
>
> >>> Named branches are exclusive, they can't be a subset of each other ;)
> >
> >Actually, they can. Take the example of the Mercurial repo itself. They
> >fix bugs in the stable branch and add features in default. When they
> >merge stable into default and commit, default becomes a superset of
> >stable. That is to say, someone pulling default also gets the
> >changesets from stable that are ancestors of the merge changset. Or in
> >other words, if you check out default, you get all bug fixes from stable=
.
>
> That makes sense, but correct me if I'm wrong, it's the 'merge' operation
> that
> made this happen, right? A merge essentially brings the changesets from
> one
> branch into another.
>
> -Barry
>
> _______________________________________________
> 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/santoso.wijaya%40gmail.=
com
>
>
[Attachment #5 (text/html)]
<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>
_______________________________________________
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/python-dev%40progressive-comp.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic