On Sat, Feb 26, 2011 at 10:23 AM, Barry Warsaw <firstname.lastname@example.org>
On Feb 26, 2011, at 06:32 PM, Éric Araujo wrote:That makes sense, but correct me if I'm wrong, it's the 'merge' operation that
>>> 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.
made this happen, right? A merge essentially brings the changesets from one
branch into another.
Python-Dev mailing list