A Mercurial 'merge' <http://mercurial.selenic.com/wiki/Branch> 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.
~/santa On Sat, Feb 26, 2011 at 10:23 AM, Barry Warsaw <ba...@python.org> wrote: > On Feb 26, 2011, at 06:32 PM, Éric 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 > >
_______________________________________________ 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/archive%40mail-archive.com
