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: Mon, 22 Nov 2010 09:39:58 -0500 Message-ID: References: <87y68m7kdh.fsf@stupidchicken.com> <87lj4mk2e5.fsf@stupidchicken.com> <87mxp2bd12.fsf@stupidchicken.com> <87k4k6c738.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1290436834 23582 80.91.229.12 (22 Nov 2010 14:40:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 22 Nov 2010 14:40:34 +0000 (UTC) Cc: Dan Nicolaescu , Chong Yidong , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 22 15:40:29 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 1PKXZC-00022Q-OO for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 15:40:26 +0100 Original-Received: from localhost ([127.0.0.1]:33960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKXZC-00045g-2O for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 09:40:26 -0500 Original-Received: from [140.186.70.92] (port=36673 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKXYu-000441-36 for emacs-devel@gnu.org; Mon, 22 Nov 2010 09:40:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKXYp-0002ji-1w for emacs-devel@gnu.org; Mon, 22 Nov 2010 09:40:07 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:53974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKXYo-0002id-TF; Mon, 22 Nov 2010 09:40:03 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id oAMEdxnj003193; Mon, 22 Nov 2010 09:39:59 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 7812DA83C8; Mon, 22 Nov 2010 09:39:58 -0500 (EST) In-Reply-To: <87k4k6c738.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Mon, 22 Nov 2010 13:31:23 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3686=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:133004 Archived-At: >> 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. > bzr pull -- synchronize branch to parent exactly, never does a > non-trivial merge, sometimes operates on a non-local > branch and not on the workspace IIRC. > git pull -- merges branch into workspace, commits unless conflict, > never affects a branch outside of the workspace. > hg pull -- fetches branch, never updates workspace or affects a > branch outside of the workspace. > I don't see the point of having a single command whose implementation > can vary so randomly. That's OK: "cvs pull" is even further from the above, so my suggestion is not to "just pass `pull' to the backend command" but "run the normal command to update the current tree by bringing in changes from upstream". Based on what you say, vc-pull for Mercurial would not just do "hg pull" but something more. Stefan