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 09:55:57 +0100 Message-ID: <85abnkodlu.fsf@lola.goethe.zz> References: <20071230122217.3CA84830B9A@snark.thyrsus.com> <20071231130712.GB8641@thyrsus.com> <87y7b96az8.fsf@member.fsf.org> <87fxxfnrhi.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1199523329 9440 80.91.229.12 (5 Jan 2008 08:55:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 5 Jan 2008 08:55:29 +0000 (UTC) Cc: tassilo@member.fsf.org, emacs-devel@gnu.org, Miles Bader To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 05 09:55:48 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 1JB4ok-0002qW-IQ for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 09:55:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JB4oO-0003aK-2S for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 03:55:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JB4oK-0003Zf-Ly for emacs-devel@gnu.org; Sat, 05 Jan 2008 03:55:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JB4oJ-0003Xq-1a for emacs-devel@gnu.org; Sat, 05 Jan 2008 03:55:20 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JB4oI-0003Xh-PY for emacs-devel@gnu.org; Sat, 05 Jan 2008 03:55:18 -0500 Original-Received: from mail-in-17.arcor-online.net ([151.189.21.57]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JB4oA-0007c7-Q1; Sat, 05 Jan 2008 03:55:11 -0500 Original-Received: from mail-in-02-z2.arcor-online.net (mail-in-02-z2.arcor-online.net [151.189.8.14]) by mail-in-17.arcor-online.net (Postfix) with ESMTP id 7769A2BB89E; Sat, 5 Jan 2008 09:55:04 +0100 (CET) Original-Received: from mail-in-03.arcor-online.net (mail-in-03.arcor-online.net [151.189.21.43]) by mail-in-02-z2.arcor-online.net (Postfix) with ESMTP id 64D11114373; Sat, 5 Jan 2008 09:55:04 +0100 (CET) Original-Received: from lola.goethe.zz (dslb-084-061-048-012.pools.arcor-ip.net [84.61.48.12]) by mail-in-03.arcor-online.net (Postfix) with ESMTP id 4843C30AC20; Sat, 5 Jan 2008 09:54:59 +0100 (CET) Original-Received: by lola.goethe.zz (Postfix, from userid 1002) id 01FAA1CCF7AE; Sat, 5 Jan 2008 09:55:57 +0100 (CET) In-Reply-To: (Richard Stallman's message of "Sat, 05 Jan 2008 00:55:46 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-Virus-Scanned: ClamAV 0.91.2/5368/Sat Jan 5 01:35:28 2008 on mail-in-03.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:86121 Archived-At: Richard Stallman writes: > So perhaps you hack all day, periodically making commits (using "git > commit") which store your changes into the .git subdir. Then when you > later connect to the net, you can merge the new changes in .git into the > remote emacs repository on savannah (using "git push"). > > It sounds like "git push" is the real analogue of CVS commit, No. Pushing works between repositories. It is the way to propagate changes to others. > and that this is the closest match-up between the concepts of git > and the concepts of CVS: > > 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. You have all that working machinery to your disposal once you have committed. Pushing just pushes out your commits (and not just a snapshot) to the remote repository. It does not change what you are working with. Your own repository and workflow is not affected. You never need to push in order to get something into better working order for yourself. Note that while you have not pushed out anything, git has a variety of tools for rewriting and cleaning up your own branches/repository. In that manner, a new feature usually arrives in one coherent series of commits. Also, if you are developing a new feature, you need not push it out to the central repository, but can still share the development with a private set of other people. > commit = pull or push > > But I still don't understand what step actually alters the trunk that > users will get by default from the public repository. Does `push' do > that? If not `push', then what? Pushing will, yes. The act of pushing will make the remote trunk assume the state of the current trunk (without dropping changes only available in the remote trunk: in that case, git requires you to pull and merge those first). -- David Kastrup, Kriemhildstr. 15, 44793 Bochum