From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: vc-update for bzr etc. Date: Sun, 21 Nov 2010 21:04:28 -0500 Message-ID: References: <87y68m7kdh.fsf@stupidchicken.com> <87lj4mk2e5.fsf@stupidchicken.com> <87mxp2bd12.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1290391486 9624 80.91.229.12 (22 Nov 2010 02:04:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 22 Nov 2010 02:04:46 +0000 (UTC) Cc: Dan Nicolaescu , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 22 03:04:42 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 1PKLln-0001j9-05 for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 03:04:39 +0100 Original-Received: from localhost ([127.0.0.1]:59754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKLlm-00008D-I7 for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 21:04:38 -0500 Original-Received: from [140.186.70.92] (port=51202 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKLlg-000088-L9 for emacs-devel@gnu.org; Sun, 21 Nov 2010 21:04:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKLlf-0003U2-91 for emacs-devel@gnu.org; Sun, 21 Nov 2010 21:04:32 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:29297 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKLld-0003Tp-Sy; Sun, 21 Nov 2010 21:04:29 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlEIAF9e6UxFxKB0/2dsb2JhbAChVn1yujGFSwSEWo1p X-IronPort-AV: E=Sophos;i="4.59,232,1288584000"; d="scan'208";a="83169950" Original-Received: from 69-196-160-116.dsl.teksavvy.com (HELO ceviche.home) ([69.196.160.116]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 21 Nov 2010 21:04:28 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id A071D660F5; Sun, 21 Nov 2010 21:04:28 -0500 (EST) In-Reply-To: <87mxp2bd12.fsf@stupidchicken.com> (Chong Yidong's message of "Sun, 21 Nov 2010 16:08:25 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.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:132988 Archived-At: >>> So the full functionality for Bzr should be something like this: >>> - If it's a bound branch, do bzr update. >>> - Otherwise, if there is a default pull location, prompt for a location >>> and do "bzr merge --pull". >>> - Otherwise, just do "bzr merge --pull" to use the default location. >>> Does this sound right? >> >> If it's not bound, it should just use "bzr pull" without prompting >> the user, IMO. > The "bzr pull" operation only works if the branches have not diverged. > If the vc pull operation corresponds to "bzr pull", then what would it > do in git? IIUC, git pulls perform merging automatically, so if vc-pull > does "bzr pull" in bzr and "git pull" in git, it would be doing two > different things. > That's why I thought the closest common denominator would be to use > bzr's "merge --pull". VC tries to present a uniform UI and that is good, but trying to impose a uniform semantics to all commands is asking too much. So I think it's perfectly OK for vc-pull/update to do "bzr pull" for Bzr and "git pull" for Git, even if they don't do exactly the same thing. Stefan