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

[Barry Warsaw <barry@python.org>]

[-- Attachment #1: Type: text/plain, Size: 899 bytes --]

On Jan 06, 2014, at 09:20 PM, Eli Zaretskii wrote:

>But then you lose history of each patch, I presume: each patch appears
>as a single flat changeset with no history.  When I work on a
>non-trivial feature in a local branch, I make lots of small commits,
>each one implementing a small sub-feature or a part thereof, usually
>after testing the part that was added.  This history is useful later,
>when the whole series is merged to mainline, because if there's a
>regression, bisecting a series of small commits is easier than a
>single large commit.

I agree that this is a great workflow, which feels very natural in bzr thanks
to its emphasis on mainline development.  But that's going to work quite
differently in git, since as Stephen has pointed out, git bisect seems to lack
a --first-parent switch (which log and rev-list have, though sadly are not the
default).

-Barry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]