From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Tue, 18 Nov 2014 23:35:34 +0000 Message-ID: <20141118233534.GC5167@acm.acm> References: <20141114230235.GF3168@acm.acm> <20141117141123.GA4294@acm.acm> <83lhn89zxn.fsf@gnu.org> <83bno49xtw.fsf@gnu.org> <871tp0umzj.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416353803 22839 80.91.229.3 (18 Nov 2014 23:36:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 23:36:43 +0000 (UTC) Cc: Sergey Organov , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 19 00:36:35 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 1XqsK3-0007BW-2r for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 00:36:35 +0100 Original-Received: from localhost ([::1]:55918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqsK2-0008Iv-JM for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 18:36:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqsJi-0008Hs-UK for emacs-devel@gnu.org; Tue, 18 Nov 2014 18:36:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqsJb-0005Mp-FC for emacs-devel@gnu.org; Tue, 18 Nov 2014 18:36:14 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:35603 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqsJb-0005KU-6Q for emacs-devel@gnu.org; Tue, 18 Nov 2014 18:36:07 -0500 Original-Received: (qmail 95006 invoked by uid 3782); 18 Nov 2014 23:36:06 -0000 Original-Received: from acm.muc.de (pD951BE3D.dip0.t-ipconnect.de [217.81.190.61]) by colin.muc.de (tmda-ofmipd) with ESMTP; Wed, 19 Nov 2014 00:36:04 +0100 Original-Received: (qmail 5458 invoked by uid 1000); 18 Nov 2014 23:35:34 -0000 Content-Disposition: inline In-Reply-To: <871tp0umzj.fsf@uwakimon.sk.tsukuba.ac.jp> User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:177696 Archived-At: Hello, Stephen. On Wed, Nov 19, 2014 at 08:07:12AM +0900, Stephen J. Turnbull wrote: > Sergey Organov writes: > > You see, you should have had no "made on that branch" in your > > description, provided you describe Gits' idea of a branch, not your one, > > as Git does not remember on what branch commit was made. > No DAG-based VCS (with the single exception of Mercurial's "named > branches" AFAIK) remembers on what branch a commit was made. Are you sure? When I do hg log -b c++11-0-1 , Mercurial lists every changeset made on branch c++11-0-1, and no other changesets. It knows when the branch was created, and distinguishes it from the other branch it separated from. I think this last feature is missing in git. > What Mercurial and Bazaar try to do is ensure a one-to-many branch-to- > workspace mapping, so that you must change workspaces to change the > focus of development. Some people apparently enjoy that restraint. Can't say I've ever felt that to be any sort of restriction. I can imagine that having nine or ten foci of development in on workspace would be unworkable in the extreme. > What amazes me is that they're not all Java developers. ;-) :-) -- Alan Mackenzie (Nuremberg, Germany).