From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Branches are Scary Date: Thu, 17 Dec 2015 22:20:06 +0000 Message-ID: <8737v0yay1.fsf@russet.org.uk> References: <87bn9oydgw.fsf@russet.org.uk> <874mfgn3t7.fsf@acer.localhost.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1450390854 12600 80.91.229.3 (17 Dec 2015 22:20:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Dec 2015 22:20:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ingo Lohmar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 17 23:20:43 2015 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 1a9gub-0005sU-6N for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 23:20:37 +0100 Original-Received: from localhost ([::1]:57446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9gua-0004QE-7H for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 17:20:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9guB-0004OV-K3 for emacs-devel@gnu.org; Thu, 17 Dec 2015 17:20:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9gu8-00083f-Ac for emacs-devel@gnu.org; Thu, 17 Dec 2015 17:20:11 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:56211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9gu8-00082u-53 for emacs-devel@gnu.org; Thu, 17 Dec 2015 17:20:08 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a9gu7-0008Ur-EB; Thu, 17 Dec 2015 22:20:07 +0000 Original-Received: from cpc6-benw10-2-0-cust45.gate.cable.virginm.net ([92.238.179.46] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a9gu7-0001O3-7t; Thu, 17 Dec 2015 22:20:07 +0000 In-Reply-To: <874mfgn3t7.fsf@acer.localhost.com> (Ingo Lohmar's message of "Thu, 17 Dec 2015 22:49:40 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.22 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:196437 Archived-At: Ingo Lohmar writes: >> I always find deleting branches (that I have created) rather an unhappy >> experience, as I worry that I will do the wrong thing, and accidentally >> delete emacs-25. > > If you only delete local branches, that should not happen without your > explicit consent (unless you are using a fairly malicious interface on > top of plain git). I'm using magit. I don't know what will happen if I try, and obvious, I don't want to try. >> At the same time, if I am understanding things correctly, I can't squash >> and force feature and fix branches that I have pushed up, which means >> that these have to get deleted unmerged cause I squash and merge locally. > > It seems that *this* is the actual problem to solve. The rule of thumb > is simple: Do not squash or rebase any commits you have pushed out, it > makes life hard for everybody else, that's why it's not allowed in the > repository. If you still plan substantial cleanup of your commits, just > do not push them yet. Makes it hard to get comments on them, I think. I had substantial comments on one branch (couldn't have completed it without them) as well as an effective code review before I merged. Possibly, the solution is not to use the main emacs git for this form of collaboration, but to publish my own repo, but this seems an obvious use to me. Clearly rebasing on a branch with many people are working on would be bad. > I am also unsure whether force-deleting branches in the emacs repo is > permitted, but it does not matter: Please do not try to work around the > restrictions by deleting branches. I'm not. Just trying to clean up after myself. > >> >> Perhaps I am worried about this unnecessarily. Can I delete emacs-25 or >> master by mistake? And, at the same time, is it possible to squash >> things in other branches? >> >> Phil > > The concept of squashing is fairly unrelated to the concept of branches. > The rules are the same for all commits, wherever they are. Then I have learned something. Probably I can delete emacs-25 if I want. Ah, well, I will just have to be careful. Phil