Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!eu.feeder.erje.net!xlned.com!feeder1.xlned.com!newsfeed.xs4all.nl!newsfeed1.news.xs4all.nl!xs4all!post.news.xs4all.nl!not-for-mail
Return-Path: <python.list@tim.thechases.com>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
X-Spam-Status: OK 0.039
X-Spam-Evidence: '*H*': 0.92; '*S*': 0.00; 'mercurial': 0.09; 'cc:addr :python-list': 0.11; '-tkc': 0.16; 'from:addr:python.list': 0.16; 'from:addr:tim.thechases.com': 0.16; 'from:name:tim chase': 0.16; 'letting': 0.16; 'pair.': 0.16; 'wrote:': 0.18; 'cc:addr:python.org': 0.22; 'merge': 0.24; 'cc:2**0': 0.24; 'cc:no real name:2**0': 0.24; 'header:In-Reply-To:1': 0.27; 'point': 0.28; 'tim': 0.29; 'branches': 0.31; 'chase': 0.31; "can't": 0.35; 'possible': 0.36; 'two': 0.37; '8bit%:86': 0.38; 'rather': 0.38; 'more': 0.64; 'to:addr:gmail.com': 0.65; 'history,': 0.84; 'received:50.22': 0.84; 'subject:Control': 0.84
Date: Thu, 13 Jun 2013 07:34:53 -0500
From: Tim Chase <python.list@tim.thechases.com>
To: Serhiy Storchaka <storchaka@gmail.com>
Subject: Re: Version Control Software
In-Reply-To: <kpbrs9$k7s$1@ger.gmane.org>
References: <98c13a55-dbf2-46a7-a2aa-8c5f052ff375@googlegroups.com> <CAPTjJmr+Kgdrs4=tutjdSb0jMP+WHAdAnotE6tym26Riwin7cQ@mail.gmail.com> <20130612214158.4b21a700@bigbox.christie.dr> <kpbrs9$k7s$1@ger.gmane.org>
X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
X-AntiAbuse: Primary Hostname - boston.accountservergroup.com
X-AntiAbuse: Original Domain - python.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - tim.thechases.com
Cc: python-list@python.org
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: General discussion list for the Python programming language <python-list.python.org>
List-Unsubscribe: <http://mail.python.org/mailman/options/python-list>, <mailto:python-list-request@python.org?subject=unsubscribe>
List-Archive: <http://mail.python.org/pipermail/python-list/>
List-Post: <mailto:python-list@python.org>
List-Help: <mailto:python-list-request@python.org?subject=help>
List-Subscribe: <http://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe>
Newsgroups: comp.lang.python
Message-ID: <mailman.3185.1371126784.3114.python-list@python.org>
Lines: 18
NNTP-Posting-Host: 2001:888:2000:d::a6
X-Trace: 1371126784 news.xs4all.nl 15883 [2001:888:2000:d::a6]:56561
X-Complaints-To: abuse@xs4all.nl
Xref: csiph.com comp.lang.python:47947

On 2013-06-13 10:20, Serhiy Storchaka wrote:
> 13.06.13 05:41, Tim Chase =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=B2(=D0=
=BB=D0=B0):
> > -hg: last I checked, can't do octopus merges (merges with more
> > than two parents)
> >
> > +git: can do octopus merges
>=20
> Actually it is possible in Mercurial.

Okay, then that moots this pro/con pair.  I seem to recall that at
one point in history, Mercurial required you to do pairwise merges
rather than letting you merge multiple branches in one pass.

-tkc