From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: About commit style Date: Sat, 06 Apr 2013 12:08:15 +0300 Message-ID: <83a9pcdo1s.fsf@gnu.org> References: <20130406161308.f195518200567a56f123ac05@gmail.com> <83d2u8dorn.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1365278477 27701 80.91.229.3 (6 Apr 2013 20:01:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Apr 2013 20:01:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: xfq.free@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 06 22:01:18 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UOZIQ-0007UX-Dx for ged-emacs-devel@m.gmane.org; Sat, 06 Apr 2013 22:01:06 +0200 Original-Received: from localhost ([::1]:34421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOP7H-0004oe-KO for ged-emacs-devel@m.gmane.org; Sat, 06 Apr 2013 05:08:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOP7D-0004oR-KE for emacs-devel@gnu.org; Sat, 06 Apr 2013 05:08:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOP7C-0005Zg-77 for emacs-devel@gnu.org; Sat, 06 Apr 2013 05:08:51 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:50271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOP7B-0005ZV-VV for emacs-devel@gnu.org; Sat, 06 Apr 2013 05:08:50 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MKT00D00T921V00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 06 Apr 2013 12:08:11 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MKT00CEQTDNSD60@a-mtaout20.012.net.il>; Sat, 06 Apr 2013 12:08:11 +0300 (IDT) In-reply-to: <83d2u8dorn.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:158700 Archived-At: > Date: Sat, 06 Apr 2013 11:52:44 +0300 > From: Eli Zaretskii > 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.