From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ingo Lohmar Newsgroups: gmane.emacs.devel Subject: Re: Branches are Scary Date: Thu, 17 Dec 2015 22:49:40 +0100 Message-ID: <874mfgn3t7.fsf@acer.localhost.com> References: <87bn9oydgw.fsf@russet.org.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1450389008 15178 80.91.229.3 (17 Dec 2015 21:50:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Dec 2015 21:50:08 +0000 (UTC) To: Phillip Lord , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 17 22:50:03 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 1a9gR0-0001Om-CP for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 22:50:02 +0100 Original-Received: from localhost ([::1]:57335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9gQz-0000wc-Po for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 16:50:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9gQl-0000uR-Re for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:49:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9gQh-0000Z5-RC for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:49:47 -0500 Original-Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:37157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9gQh-0000Yi-LX for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:49:43 -0500 Original-Received: by mail-wm0-x22c.google.com with SMTP id p187so40153956wmp.0 for ; Thu, 17 Dec 2015 13:49:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type; bh=nQQbS9GE+7x+cu3iDcrOUGGupBQisH1Ymx9kacdCHBM=; b=agmFAHIdK0xHnnoNvIp5SlSts4JUWE7gzbma4UgSVsgMXybkCRuGq8SXqyTsv6Clt1 WPLK9uDmJp4abIQBEBj6HYPHlgK0WBeARr9CGBV9WB/7z7OiFAX0RrbIqsHDiz1axVRk Jv60xeZdKskdKTHuMnCMsuZEaKDKpfcj0hzlZSqhTryS2AT2a5bUz+qdL47dAjfTWsKR o+rhrs11kC/msR/hz0Z6/BiXs/Bsyeif/KeF4zZ571BjyfXATbdQ3KRnHUQiHkaS9/KL JCgyQO79TgEYXkzI8IvSKdOQA5fodwKvGDhNZuJUT5NxMDTX7BF4dtjuOprj0r3U734l uffQ== X-Received: by 10.28.183.215 with SMTP id h206mr6999241wmf.0.1450388982642; Thu, 17 Dec 2015 13:49:42 -0800 (PST) Original-Received: from localhost (xdsl-78-35-237-52.netcologne.de. [78.35.237.52]) by smtp.gmail.com with ESMTPSA id ft4sm12057277wjb.37.2015.12.17.13.49.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Dec 2015 13:49:41 -0800 (PST) In-Reply-To: <87bn9oydgw.fsf@russet.org.uk> User-Agent: Notmuch/0.20.2+113~g6332e6e (http://notmuchmail.org) Emacs/25.1.50.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22c 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:196434 Archived-At: Hi Phillip, On Thu, Dec 17 2015 21:25 (+0000), Phillip Lord wrote: > I was wondering if anyone could describe the git setup wrt to branches > on the main Emacs git. > > 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). > > 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. 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. > > 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. Ingo