From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: vc-update for bzr etc. Date: Mon, 22 Nov 2010 09:40:12 +0100 Message-ID: <871v6dpx8z.fsf@ambire.localdomain> 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 1290415570 21040 80.91.229.12 (22 Nov 2010 08:46:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 22 Nov 2010 08:46:10 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 22 09:46:05 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 1PKS2A-0003nF-Am for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 09:45:58 +0100 Original-Received: from localhost ([127.0.0.1]:47219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKS29-0006V9-32 for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 03:45:57 -0500 Original-Received: from [140.186.70.92] (port=46017 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKS19-0006TN-FR for emacs-devel@gnu.org; Mon, 22 Nov 2010 03:44:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKS18-0008D5-Av for emacs-devel@gnu.org; Mon, 22 Nov 2010 03:44:55 -0500 Original-Received: from smtp204.alice.it ([82.57.200.100]:42970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKS18-0008Cf-1m for emacs-devel@gnu.org; Mon, 22 Nov 2010 03:44:54 -0500 Original-Received: from ambire.localdomain (95.245.66.63) by smtp204.alice.it (8.5.124.08) id 4C88E33B05C4721A for emacs-devel@gnu.org; Mon, 22 Nov 2010 09:44:49 +0100 Original-Received: from ttn by ambire.localdomain with local (Exim 4.69) (envelope-from ) id 1PKRwb-0001bD-30 for emacs-devel@gnu.org; Mon, 22 Nov 2010 09:40:13 +0100 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-detected-operating-system: by eggs.gnu.org: Windows 98 (1) 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:132994 Archived-At: () "Stephen J. Turnbull" () Mon, 22 Nov 2010 13:31:23 +0900 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 not a uniform UI, that's a nondeterministic one. I agree that perfectly uniform semantics is not really possible, of course. Looks like the sub-operations are: (0) determine "news" (1) download "news" (to some temporary space) (2) merge (conditionally, looping for conflict resolution, etc) (3) commit Can these DVCSes do such sub-operations *individually* somehow? Step (3) is given, but the others?