From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Sat, 05 Jan 2008 16:39:09 +0100 Message-ID: <857iiomgde.fsf@lola.goethe.zz> References: <20071230122217.3CA84830B9A@snark.thyrsus.com> <20071231130712.GB8641@thyrsus.com> <87y7b96az8.fsf@member.fsf.org> <87fxxfnrhi.fsf@catnip.gol.com> <85abnkodlu.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1199547609 7989 80.91.229.12 (5 Jan 2008 15:40:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 5 Jan 2008 15:40:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 05 16:40:30 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JBB81-0006Hi-5k for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 16:40:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBB7e-0005aw-Mg for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 10:39:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JBB6g-0004X1-Lp for emacs-devel@gnu.org; Sat, 05 Jan 2008 10:38:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JBB6f-0004V0-9m for emacs-devel@gnu.org; Sat, 05 Jan 2008 10:38:42 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBB6e-0004Uf-TP for emacs-devel@gnu.org; Sat, 05 Jan 2008 10:38:40 -0500 Original-Received: from mail-in-05.arcor-online.net ([151.189.21.45]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JBB6a-0007zT-PT; Sat, 05 Jan 2008 10:38:37 -0500 Original-Received: from mail-in-07-z2.arcor-online.net (mail-in-07-z2.arcor-online.net [151.189.8.19]) by mail-in-05.arcor-online.net (Postfix) with ESMTP id 5A81C183617; Sat, 5 Jan 2008 16:38:27 +0100 (CET) Original-Received: from mail-in-16.arcor-online.net (mail-in-16.arcor-online.net [151.189.21.56]) by mail-in-07-z2.arcor-online.net (Postfix) with ESMTP id 4E0EE2C6C37; Sat, 5 Jan 2008 16:38:27 +0100 (CET) Original-Received: from lola.goethe.zz (dslb-084-061-039-009.pools.arcor-ip.net [84.61.39.9]) by mail-in-16.arcor-online.net (Postfix) with ESMTP id 218511A52D5; Sat, 5 Jan 2008 16:38:09 +0100 (CET) Original-Received: by lola.goethe.zz (Postfix, from userid 1002) id C3D7E1CCF7AE; Sat, 5 Jan 2008 16:39:09 +0100 (CET) In-Reply-To: (Eli Zaretskii's message of "Sat, 05 Jan 2008 17:23:25 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-Virus-Scanned: ClamAV 0.91.2/5375/Sat Jan 5 14:44:50 2008 on mail-in-16.arcor-online.net X-Virus-Status: Clean X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:86183 Archived-At: Eli Zaretskii writes: >> From: David Kastrup >> Date: Sat, 05 Jan 2008 09:55:57 +0100 >> Cc: tassilo@member.fsf.org, emacs-devel@gnu.org, Miles Bader >> >> > CVS GIT >> > save file = commit >> >> No. Saving a file will not give you all the version control history and >> tools and diffs and branching and other tools that committing does under >> git. > > What tools and diffs are those? So far, AFAIU, the only difference > between save-file and GIT commit is that with the latter, you can > start a (local) branch. If there are other reasons for local commits, > what are they? Being able to start a local branch at the drop of a hat is actually very very valuable. Anyway: You can diff between any committed versions. You can revert particular commits. You can checkout any previous version by date or version. Branching is actually quite important since you can work on several unfinished projects at once, deciding for yourself when and how you merge in upstream changes to keep your branch abreast. You can make a bloody mess of your repository and back out again (it is actually rather hard to really lose any history with git) without anybody else noticing. You can merge in a particular patch set from somebody else. If you notice a regression, you can create a test case for it and let git automatically biject from your local branch history until it pinpoints what commit has been responsible for the regression. Once you think you have reached a good state of your local branch, you can clean up and merge and reorder the commits into sensible order, and then push or offer them as a coherent, well-organized set of commits (so there is no need for something like a ChangeLog cleanup) on top of some externally available branch. -- David Kastrup, Kriemhildstr. 15, 44793 Bochum