From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 14:30:15 +0900 Message-ID: <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <87h9xttmwa.fsf@uwakimon.sk.tsukuba.ac.jp> <83oas13p1y.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1416634875 27614 80.91.229.3 (22 Nov 2014 05:41:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 05:41:15 +0000 (UTC) Cc: Stromeko@nexgo.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 06:41:04 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 1Xs3RQ-0002K0-Bf for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 06:41:04 +0100 Original-Received: from localhost ([::1]:43866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs3He-0006FJ-R2 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 00:30:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs3HJ-0006Ez-3J for emacs-devel@gnu.org; Sat, 22 Nov 2014 00:30:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs3HC-0001VM-VE for emacs-devel@gnu.org; Sat, 22 Nov 2014 00:30:36 -0500 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:47803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs3H6-0001Tg-I2; Sat, 22 Nov 2014 00:30:24 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id E4D361C398E; Sat, 22 Nov 2014 14:30:15 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id C13D51A2892; Sat, 22 Nov 2014 14:30:15 +0900 (JST) In-Reply-To: <83oas13p1y.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" acf1c26e3019 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:177964 Archived-At: Eli Zaretskii writes: > > From: "Stephen J. Turnbull" > > 3) multiple clones, build per clone (I don't think it much matters > > whether it is in-tree or not, and people who use out-of-tree builds > > probably have other reasons for doing that already, and they'll > > know what they are doing). Disadvantages: one of the clones will > > be used for "stable" -> trunk merges and reverse cherry-picking, > > and you need to keep track of which one. You also need a lot more > > VCS operations to keep them in synch. > I tend to recommend 3), but I don't understand the disadvantages; can > you elaborate? I thought it was possible to merge between clones, are > you saying that's not a good idea? The disadvantages are relatively minor. Technically speaking, it's not possible in git to merge between clones, you have to fetch and then merge (== pull). But aside from this difference in terminology, this should be familiar to bzr and Mercurial users who use multiple workspaces. (In fact Mercurial users also use "pull", but it doesn't update and commit.) Another issue is that I find it easy to do fixes to the "wrong" branch in the current repo, and that gets confusing. I also know how to unwedge myself now, but I can remember getting confused about the state of my repos occasionally. That might just be me, since I was experimenting with various workflows. Finally, I just find it more efficient to work in a single clone.