Re: dealing with local patches - mercurial queues over bzr/git checkout

[David Kastrup]

Eli Zaretskii <address@hidden> writes:

>> From: Achim Gratz <address@hidden>
>> Date: Mon, 06 Jan 2014 22:51:47 +0100
>> 
>> I find that in Git simply rebasing the local branch on top of upstream
>> (which can be configured to be done instead of a merge when you "pull")
>> keeps that history inside the local branch intact while producing a nice
>> linear history when you finally push it upstream (with or without
>> rewriting it before the push), without the messiness of many superfluous
>> merges.
>
> But then if I need to bisect the merge done by you, I see a single
> large commit, instead of the series of small ones.  And that makes it
> hard both to bisect and, if needed, revert a small part of the merge.

<URL:http://code.google.com/p/lilypond/issues/detail?id=3648#c17>

-- 
David Kastrup