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: scratch/gnus-cloud ece27ed 01/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Sat, 02 Jul 2016 09:29:29 +0300 Message-ID: <83inwotuwm.fsf@gnu.org> References: <20160701173748.21438.91559@vcs.savannah.gnu.org> <20160701173750.9F5F1220067@vcs.savannah.gnu.org> <87inwpjlnc.fsf@lifelogs.com> <83lh1ltcva.fsf@gnu.org> <8760spjftg.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1467441006 18121 80.91.229.3 (2 Jul 2016 06:30:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Jul 2016 06:30:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 02 08:29:59 2016 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 1bJERC-0004EN-Fa for ged-emacs-devel@m.gmane.org; Sat, 02 Jul 2016 08:29:58 +0200 Original-Received: from localhost ([::1]:37123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJERB-0003ac-3h for ged-emacs-devel@m.gmane.org; Sat, 02 Jul 2016 02:29:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJER3-0003aW-JY for emacs-devel@gnu.org; Sat, 02 Jul 2016 02:29:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJEQz-0007dI-E2 for emacs-devel@gnu.org; Sat, 02 Jul 2016 02:29:48 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJEQz-0007dE-BN for emacs-devel@gnu.org; Sat, 02 Jul 2016 02:29:45 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2161 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bJEQx-0006ou-N0 for emacs-devel@gnu.org; Sat, 02 Jul 2016 02:29:45 -0400 In-reply-to: <8760spjftg.fsf@lifelogs.com> (message from Ted Zlatanov on Fri, 01 Jul 2016 15:53:15 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:205070 Archived-At: > From: Ted Zlatanov > Date: Fri, 01 Jul 2016 15:53:15 -0400 > > EZ> Why did you make so many merges from master onto the scratch branch? > EZ> This shouldn't be necessary to begin with. > > The point is that it's a scratch branch. I'm asking for these branches > to be excluded from diffs, otherwise I'll have to use another Git server > so I'm not spamming emacs-diffs. A scratch branch is still a public branch. I don't necessarily object to excluding them from emacs-diffs, but I don't know who can do that, nor whether it's at all possible. > FWIW, I merge the current master into my branch to make sure it works > fine. This is automated so it happens all the time, and I will rebase, > squash, and adjust the commit messages when it's time to push the code > to a public branch. I don't see why you need all that. The final merge onto master needs to be tested anyway, so the best practice IME is not to merge from master during development. > But all that is not relevant, there are many ways to generate noise > in scratch branches. Well, the best way to combat the noise is not to generate it in the first place.