From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David De La Harpe Golden Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Sun, 31 Jan 2010 16:40:52 +0000 Message-ID: <4B65B294.3010605@harpegolden.net> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> <873a1qt32z.fsf@telefonica.net> <83aavyt0bt.fsf@gnu.org> <201001290200.o0T200xh010567@godzilla.ics.uci.edu> <83y6jhs2b6.fsf@gnu.org> <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> <201001291729.o0THTFam010863@godzilla.ics.uci.edu> <87ljfgdatj.fsf@telefonica.net> <83d40ssn0g.fsf@gnu.org> <873a1nk2st.fsf@ambire.localdomain> <83pr4rilv3.fsf@gnu.org> <873a1nza8y.fsf@ambire.localdomain> <87sk9mmfel.fsf@ambire.localdomain> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1264956083 19533 80.91.229.12 (31 Jan 2010 16:41:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Jan 2010 16:41:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: Thien-Thi Nguyen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 31 17:41:20 2010 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.69) (envelope-from ) id 1NbcrO-0006Yx-27 for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2010 17:41:18 +0100 Original-Received: from localhost ([127.0.0.1]:33518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NbcrN-000569-IQ for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2010 11:41:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nbcr6-0004xH-Ch for emacs-devel@gnu.org; Sun, 31 Jan 2010 11:41:00 -0500 Original-Received: from [199.232.76.173] (port=50561 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nbcr5-0004ww-UN for emacs-devel@gnu.org; Sun, 31 Jan 2010 11:41:00 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nbcr4-0003ur-Oc for emacs-devel@gnu.org; Sun, 31 Jan 2010 11:40:59 -0500 Original-Received: from harpegolden.net ([65.99.215.13]:45592) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nbcr4-0003uj-Fh for emacs-devel@gnu.org; Sun, 31 Jan 2010 11:40:58 -0500 Original-Received: from [87.198.54.207] (87-198-54-207.ptr.magnet.ie [87.198.54.207]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "David De La Harpe Golden", Issuer "David De La Harpe Golden Personal CA rev 3" (verified OK)) by harpegolden.net (Postfix) with ESMTP id 52A518BC1; Sun, 31 Jan 2010 16:40:57 +0000 (GMT) User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) In-Reply-To: <87sk9mmfel.fsf@ambire.localdomain> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:120750 Archived-At: Thien-Thi Nguyen wrote: > What this thread has taught me is that for bzr, "merge" does > not imply "commit". To DTRT, VC "merge" should allow for > this split in all backends, Yeah, merge doesn't necessarily imply commit in git either, e.g. when there's conflicts... and you can in fact suppress automagic stuff with "git merge --no-commit --no-ff" (the --no-ff stops it doing a fastforward even if a fastforward is possible. Actually, you'd seldom want to not do it, but the option's there in vaguely recent git, contrary to what bzr folk seemed to think IIRC)