From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Sun, 06 Jan 2008 13:09:00 -0500 Message-ID: References: <20071230122217.3CA84830B9A@snark.thyrsus.com> <20071231130712.GB8641@thyrsus.com> <87y7b96az8.fsf@member.fsf.org> <87fxxfnrhi.fsf@catnip.gol.com> Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: ger.gmane.org 1199642993 31621 80.91.229.12 (6 Jan 2008 18:09:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 6 Jan 2008 18:09:53 +0000 (UTC) Cc: tassilo@member.fsf.org, emacs-devel@gnu.org, miles@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 06 19:10:11 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 1JBZwp-00006q-5X for ged-emacs-devel@m.gmane.org; Sun, 06 Jan 2008 19:10:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBZwR-0006kr-Uq for ged-emacs-devel@m.gmane.org; Sun, 06 Jan 2008 13:09:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JBZvj-0006IJ-2i for emacs-devel@gnu.org; Sun, 06 Jan 2008 13:09:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JBZvh-0006HO-Gm for emacs-devel@gnu.org; Sun, 06 Jan 2008 13:09:02 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBZvh-0006HL-Cq for emacs-devel@gnu.org; Sun, 06 Jan 2008 13:09:01 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JBZvh-0000sU-5x; Sun, 06 Jan 2008 13:09:01 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1JBZvg-0001lY-O9; Sun, 06 Jan 2008 13:09:00 -0500 In-reply-to: (message from Stefan Monnier on Sat, 05 Jan 2008 17:46:15 -0500) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) 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:86355 Archived-At: > 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? Yes, presuming that by "push" you mean "push to the default public repository". In CVS terms, that's commit. To make a useful comparison between CVS and git, we should think of this as "conceptual commit", even though it is not called "commit" in git terminology. Thus, I think that the relationship between merging and conceptual commit is the same in git as it is in CVS. In both cases you have to merge first before you do the conceptual commit. In the above context, the equivalence would be: CVS&RCS Git save file save file commit to RCS commit commit to CVS push That seems like a good explanation too.