unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: xfq.free@gmail.com
Cc: emacs-devel@gnu.org
Subject: Re: About commit style
Date: Sat, 06 Apr 2013 12:08:15 +0300	[thread overview]
Message-ID: <83a9pcdo1s.fsf@gnu.org> (raw)
In-Reply-To: <83d2u8dorn.fsf@gnu.org>

> Date: Sat, 06 Apr 2013 11:52:44 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> You can use separate branches for that, to reduce inconvenience if
> you find the bugs when you are already half way into adding the
> feature.

Or shelve your changes, fix the bug, commit it, then unshelve the
changes and continue.

Of (if you develop the feature on a separate branch), fix the bugs on
the trunk, in which case they don't affect your feature branch work.

Or cherry-pick versions from branch to trunk, when you commit.

I'm sure there are more ways of doing this, so that (a) bugfixes are
separate from unrelated features, and (b) your development workflow is
not disrupted or inconvenienced in any way.



  reply	other threads:[~2013-04-06  9:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-06  8:13 About commit style Xue Fuqiao
2013-04-06  8:52 ` Eli Zaretskii
2013-04-06  9:08   ` Eli Zaretskii [this message]
2013-04-06 11:03     ` Xue Fuqiao
2013-04-06 13:10   ` Stefan Monnier
2013-04-06 15:02     ` Eli Zaretskii
2013-04-06 15:32       ` Stefan Monnier
2013-04-06 15:46         ` Andreas Röhler
2013-04-07  6:17   ` Xue Fuqiao
2013-04-07 15:41     ` Eli Zaretskii
2013-04-07 15:48     ` Stefan Monnier
2013-04-07 22:22       ` Xue Fuqiao

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=83a9pcdo1s.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=xfq.free@gmail.com \
    /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).