From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jordi =?ISO-8859-1?Q?Guti=E9rrez?= Hermoso Newsgroups: gmane.emacs.devel Subject: Re: Prefer Mercurial instead of git Date: Sun, 05 Jan 2014 08:55:02 -0500 Message-ID: <1388930102.11337.33.camel@Iris> 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> <871u0m7e7g.fsf@mid.deneb.enyo.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1388930113 28607 80.91.229.3 (5 Jan 2014 13:55:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Jan 2014 13:55:13 +0000 (UTC) Cc: "Stephen J. Turnbull" , David Kastrup , emacs-devel@gnu.org To: Florian Weimer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 05 14:55: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 1VzoAh-0003VO-Pc for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 14:55:19 +0100 Original-Received: from localhost ([::1]:58023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzoAh-0004OL-GR for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 08:55:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzoAY-0004O1-TU for emacs-devel@gnu.org; Sun, 05 Jan 2014 08:55:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzoAT-0008IM-2k for emacs-devel@gnu.org; Sun, 05 Jan 2014 08:55:10 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzoAS-0008I1-VF for emacs-devel@gnu.org; Sun, 05 Jan 2014 08:55:04 -0500 Original-Received: from beast.bic.mni.mcgill.ca ([132.206.178.199]:33990 helo=[IPv6:::1]) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1VzoAR-0004Db-T5; Sun, 05 Jan 2014 08:55:04 -0500 In-Reply-To: <871u0m7e7g.fsf@mid.deneb.enyo.de> X-Mailer: Evolution 3.4.4-3 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:167363 Archived-At: On Sun, 2014-01-05 at 14:25 +0100, Florian Weimer wrote: > * Jordi Guti=C3=A9rrez Hermoso: >=20 > > 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. >=20 > Back when I needed this the last time, I couldn't find documentation > how bookmarks interacted with merging. The term you want is "divergent bookmark", I think: http://mercurial.aragost.com/kick-start/en/bookmarks/#divergent-bookmar= ks > 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). You can use hg histedit to fold your commits into one. Then you can use hg export to get a diff with enough metadata to recreate your commit in another hg clone. - Jordi G. H.