From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-devel@gnu.org
Subject: Re: dealing with local patches - mercurial queues over bzr/git checkout
Date: Tue, 07 Jan 2014 20:58:00 +0100 [thread overview]
Message-ID: <87iotv4l9z.fsf@Rainer.invalid> (raw)
In-Reply-To: 83mwj8sbie.fsf@gnu.org
Eli Zaretskii writes:
> 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.
Please try it yourself. If you use the workflow I described, there is
either no merge at all or a single merge; but all your commits, large or
small, are still present after the push including their timeline. The
only thing different from the "standard" workflow is that there aren't
spurious merges to upstream inbetween, so it's vastly easier to follow
what you did from looking at the log.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
next prev parent reply other threads:[~2014-01-07 19:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 19:11 dealing with local patches - mercurial queues over bzr/git checkout Jarek Czekalski
2014-01-06 19:20 ` Eli Zaretskii
2014-01-06 19:49 ` Barry Warsaw
2014-01-06 20:33 ` Eli Zaretskii
2014-01-06 20:29 ` Jarek Czekalski
2014-01-06 21:51 ` Achim Gratz
2014-01-06 22:04 ` Andreas Schwab
2014-01-07 3:42 ` Eli Zaretskii
2014-01-07 8:41 ` David Kastrup
2014-01-07 19:58 ` Achim Gratz [this message]
2014-01-06 19:28 ` Óscar Fuentes
2014-01-06 19:31 ` Jordi Gutiérrez Hermoso
2014-01-06 20:09 ` Daniel Colascione
2014-01-06 20:27 ` Jordi Gutiérrez Hermoso
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=87iotv4l9z.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--cc=emacs-devel@gnu.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).