From: Florian Weimer <fw@deneb.enyo.de>
To: "Jordi Gutiérrez Hermoso" <jordigh@octave.org>
Cc: "Stephen J. Turnbull" <stephen@xemacs.org>,
David Kastrup <dak@gnu.org>,
emacs-devel@gnu.org
Subject: Re: Prefer Mercurial instead of git
Date: Sun, 05 Jan 2014 14:25:39 +0100 [thread overview]
Message-ID: <871u0m7e7g.fsf@mid.deneb.enyo.de> (raw)
In-Reply-To: <1388927967.11337.32.camel@Iris> ("Jordi Gutiérrez Hermoso"'s message of "Sun, 05 Jan 2014 08:19:27 -0500")
* Jordi Gutiérrez 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).
next prev parent reply other threads:[~2014-01-05 13:25 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-03 21:52 Prefer Mercurial instead of git Jordi Gutiérrez Hermoso
2014-01-04 10:11 ` David Kastrup
2014-01-04 10:20 ` David Engster
2014-01-04 10:33 ` Eric S. Raymond
2014-01-04 13:13 ` Jordi Gutiérrez Hermoso
2014-01-04 13:29 ` David Engster
2014-01-04 14:23 ` David Kastrup
2014-01-04 14:38 ` Jordi Gutiérrez Hermoso
2014-01-04 15:19 ` David Kastrup
2014-01-04 15:24 ` Jordi Gutiérrez Hermoso
2014-01-04 16:51 ` David Engster
2014-01-04 17:16 ` Jordi Gutiérrez Hermoso
2014-01-04 17:31 ` David Engster
2014-01-04 17:40 ` Jordi Gutiérrez Hermoso
2014-01-04 18:34 ` Alan Mackenzie
2014-01-04 19:26 ` Óscar Fuentes
2014-01-04 20:18 ` Stefan Monnier
2014-01-05 11:07 ` Leo Liu
2014-01-04 17:35 ` Eli Zaretskii
2014-01-04 18:25 ` Paul Eggert
2014-01-04 20:03 ` Eli Zaretskii
2014-01-06 12:26 ` Darren Hoo
2014-01-06 14:58 ` Stefan Monnier
2014-01-06 17:44 ` Eli Zaretskii
2014-01-06 19:33 ` Paul Eggert
2014-01-04 14:40 ` Jordi Gutiérrez Hermoso
2014-01-05 12:17 ` Stephen J. Turnbull
2014-01-05 13:19 ` Jordi Gutiérrez Hermoso
2014-01-05 13:25 ` Florian Weimer [this message]
2014-01-05 13:55 ` Jordi Gutiérrez Hermoso
2014-01-05 15:38 ` Óscar Fuentes
2014-01-05 16:18 ` Jordi Gutiérrez Hermoso
2014-01-05 16:41 ` Eric S. Raymond
2014-01-05 17:09 ` Óscar Fuentes
2014-01-05 23:26 ` Jordi Gutiérrez Hermoso
2014-01-06 0:38 ` Óscar Fuentes
2014-01-06 1:01 ` Jordi Gutiérrez Hermoso
2014-01-06 0:03 ` David Kastrup
2014-01-05 17:54 ` Stephen J. Turnbull
2014-01-05 23:03 ` Dov Feldstern
2014-01-05 23:23 ` Karl Fogel
2014-01-05 23:37 ` Dov Feldstern
2014-01-06 4:02 ` Stephen J. Turnbull
2014-01-05 13:56 ` David Kastrup
2014-01-04 14:12 ` Rüdiger Sonderfeld
2014-01-04 16:08 ` Sebastian Wiesner
2014-01-04 16:41 ` Jordi Gutiérrez Hermoso
2014-01-04 18:37 ` David Kastrup
2014-01-04 18:44 ` Alan Mackenzie
2014-01-04 19:04 ` Jordi Gutiérrez Hermoso
2014-01-04 19:30 ` Óscar Fuentes
2014-01-05 16:23 ` Eli Zaretskii
2014-01-05 16:46 ` Eric S. Raymond
2014-01-05 17:03 ` Eli Zaretskii
2014-01-05 16:52 ` Óscar Fuentes
2014-01-05 17:17 ` Eli Zaretskii
2014-01-05 17:55 ` Óscar Fuentes
2014-01-05 18:07 ` Eli Zaretskii
2014-01-05 18:54 ` Óscar Fuentes
2014-01-05 21:07 ` Sean Sieger
2014-01-06 0:12 ` David Kastrup
2014-01-06 0:21 ` Rostislav Svoboda
2014-01-06 0:30 ` Karl Fogel
2014-01-06 2:24 ` Jay Belanger
2014-01-06 16:51 ` Karl Fogel
2014-01-06 17:13 ` Jay Belanger
2014-01-06 3:47 ` Eli Zaretskii
2014-01-05 3:13 ` Jay Belanger
2014-01-05 17:16 ` Sebastian Wiesner
2014-01-06 0:17 ` David Kastrup
2014-01-05 2:14 ` Karl Fogel
-- strict thread matches above, loose matches on Subject: below --
2014-01-06 13:08 grischka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871u0m7e7g.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jordigh@octave.org \
--cc=stephen@xemacs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).