From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Florian Weimer Newsgroups: gmane.emacs.devel Subject: Re: Prefer Mercurial instead of git Date: Sun, 05 Jan 2014 14:25:39 +0100 Message-ID: <871u0m7e7g.fsf@mid.deneb.enyo.de> References: <1388785952.11337.16.camel@Iris> <874n5k12ft.fsf@fencepost.gnu.org> <1388841220.11337.21.camel@Iris> <87bnzrzuzp.fsf@fencepost.gnu.org> <1388846441.11337.25.camel@Iris> <8738l2k4hh.fsf@uwakimon.sk.tsukuba.ac.jp> <1388927967.11337.32.camel@Iris> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1388928375 11547 80.91.229.3 (5 Jan 2014 13:26:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Jan 2014 13:26:15 +0000 (UTC) Cc: "Stephen J. Turnbull" , David Kastrup , emacs-devel@gnu.org To: Jordi =?iso-8859-1?Q?Guti=E9rrez?= Hermoso Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 05 14:26:20 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vznib-0005G6-Cp for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 14:26:17 +0100 Original-Received: from localhost ([::1]:57921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vznia-00054q-KA for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 08:26:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzniS-00054N-2Q for emacs-devel@gnu.org; Sun, 05 Jan 2014 08:26:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzniM-0000XU-3o for emacs-devel@gnu.org; Sun, 05 Jan 2014 08:26:07 -0500 Original-Received: from ka.mail.enyo.de ([87.106.162.201]:32771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzniF-0000W8-LN; Sun, 05 Jan 2014 08:25:55 -0500 Original-Received: from [172.17.135.4] (helo=deneb.enyo.de) by ka.mail.enyo.de with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) id 1Vznhz-0003EO-UW; Sun, 05 Jan 2014 14:25:39 +0100 Original-Received: from fw by deneb.enyo.de with local (Exim 4.80) (envelope-from ) id 1Vznhz-0003Qz-Qe; Sun, 05 Jan 2014 14:25:39 +0100 In-Reply-To: <1388927967.11337.32.camel@Iris> ("Jordi =?iso-8859-1?Q?Guti?= =?iso-8859-1?Q?=E9rrez?= Hermoso"'s message of "Sun, 05 Jan 2014 08:19:27 -0500") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.162.201 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167362 Archived-At: * Jordi Guti=E9rrez Hermoso: > On Sun, 2014-01-05 at 21:17 +0900, Stephen J. Turnbull wrote: >> The problem is that Mercurial isn't git. Git definitely is the >> leader now. Git is "cool". Git is more flexible (neither Mercurial >> nor Bazaar can support workflows that use colocated branches >> heavily). > > Huh, bookmarks? We use "collocated branches" heavily in GNU Octave > during our GSoC experience, and it worked just fine. Our GSoC students > were each working on their bookmark, and we've pulled their code into > mainline when it was ready. Back when I needed this the last time, I couldn't find documentation how bookmarks interacted with merging. It also wasn't entirely clear to me how to prepare the final patch useful for submitting it upstream (I wasn't a committer, and it had to be a single, flattened patch).