Re: Prefer Mercurial instead of git

[Florian Weimer]

* 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).