From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Naming scheme for branches which will not be merged. Date: Thu, 11 Dec 2014 18:29:21 +0000 Message-ID: Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1418322592 2498 80.91.229.3 (11 Dec 2014 18:29:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Dec 2014 18:29:52 +0000 (UTC) Cc: emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 11 19:29:50 2014 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 1Xz8Uo-0005yu-6z for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 19:29:50 +0100 Original-Received: from localhost ([::1]:53079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8Un-0000iS-QK for ged-emacs-devel@m.gmane.org; Thu, 11 Dec 2014 13:29:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8UN-0000S1-OX for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:29:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz8UM-0007QG-Nf for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:29:23 -0500 Original-Received: from mail-ob0-x229.google.com ([2607:f8b0:4003:c01::229]:48534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz8UM-0007P7-IS for emacs-devel@gnu.org; Thu, 11 Dec 2014 13:29:22 -0500 Original-Received: by mail-ob0-f169.google.com with SMTP id vb8so4383797obc.0 for ; Thu, 11 Dec 2014 10:29:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:date:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=Rtm6ob0FTOmTYfm+7p4UoiWpj3tqiiZVTSIP1FGdOpQ=; b=FK5tMuaep6QLxglHn2cpcfq13oC8/QwnQJTAwZfSLXu9Cj7w8BozVUu01z7LGOemoL CC1tRLzmtlxi90AxNvxfWozJrVmysopkj0tvyutNXPYvRjGRSY6kCGcUom3kLPogu4KS 3Ah25DqiYDcZNxhsAzqHjh/2EaNnSCV+nenTLIVY1iw1Z/7hH2hdkMotYrK59FdvVMAC 931NeCR6yB8PEVxCVgkzEliG3h6SO8xxZfHdVOpTCIQ9znLrwRmvoGvupTKBhYxF0dZi EXXbVY0wfm/TaMxadd20Los3dDLQjJS5kI2hbMyE1LqZbr4D5wbsVHJMlrvlXZr7ipNS IFpQ== X-Received: by 10.202.97.9 with SMTP id v9mr6996618oib.34.1418322561397; Thu, 11 Dec 2014 10:29:21 -0800 (PST) Original-Received: by 10.76.154.106 with HTTP; Thu, 11 Dec 2014 10:29:21 -0800 (PST) X-Google-Sender-Auth: PCZ6CqRVbijjICoxJrpqLNVt_XY X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c01::229 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:179811 Archived-At: 2014-12-11 17:21 GMT+00:00 Stefan Monnier > > Maybe we should decide of a particular branch-naming scheme which states > clearly that the branch won't be merged into master (it will be > applied as a brand new patch with a brand new commit message). I agree with Stefan on this. I find that the most convenient way of working on something while getting feedback is to push it to a branch in origin. For this specific purpose a branch which is not meant to be merged has a few advantages over =E2=80=9Creal=E2=80=9D branches. We can develop without worrying about the ChangeLog file. Each commit doesn't necessarily have to be a full change, which naturally lends itself to the workflow of this list where diffs commonly incite feedback which leads to small changes. Commit messages don't have to follow any convention. If you make a short commit to fix a typo, you can just say =E2=80=9CTypo=E2=80=9D and mov= e on. However, they should still be useful messages! Once this branch is given as finished, the creator (or anyone else, really), turns into one (or several) proper commit(s). This is when we write real changelog/commit messages. How this is done is irrelevant, you can use rebase+squash+merge or manually apply a patch on master. The two questions I can think of are What naming scheme should we use? Either prefix the branch name with something really obvious, like =E2=80=9Cdont-merge/BRANCH-NAME=E2=80=9D, so= that people who unaware of this convention don't make that mistake. Or prefix it with any of the usual words that denote in-development, such as =E2=80=9Cdev/BRANCH-NAME=E2=80=9D. Should the creator of the branch add his/her username to it? i.e. =E2=80=9Cdont-merge/malabarba/BRANCH-NAME=E2=80=9D.