From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: vc-update for bzr etc. Date: Sun, 21 Nov 2010 16:08:25 -0500 Message-ID: <87mxp2bd12.fsf@stupidchicken.com> References: <87y68m7kdh.fsf@stupidchicken.com> <87lj4mk2e5.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1290373723 11060 80.91.229.12 (21 Nov 2010 21:08:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 21 Nov 2010 21:08:43 +0000 (UTC) Cc: Dan Nicolaescu , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 21 22:08:39 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 1PKH9J-0005yZ-Au for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 22:08:37 +0100 Original-Received: from localhost ([127.0.0.1]:50827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKH9I-0007nN-Fo for ged-emacs-devel@m.gmane.org; Sun, 21 Nov 2010 16:08:36 -0500 Original-Received: from [140.186.70.92] (port=48864 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKH9C-0007n4-Jh for emacs-devel@gnu.org; Sun, 21 Nov 2010 16:08:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKH9B-0003jN-HR for emacs-devel@gnu.org; Sun, 21 Nov 2010 16:08:30 -0500 Original-Received: from pantheon-po26.its.yale.edu ([130.132.50.121]:36050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKH9B-0003j9-EZ; Sun, 21 Nov 2010 16:08:29 -0500 Original-Received: from furball (dhcp128036014014.central.yale.edu [128.36.14.14]) (authenticated bits=0) by pantheon-po26.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id oALL8QAa014276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 21 Nov 2010 16:08:27 -0500 Original-Received: by furball (Postfix, from userid 1000) id 409611610A5; Sun, 21 Nov 2010 16:08:26 -0500 (EST) In-Reply-To: (Stefan Monnier's message of "Sun, 21 Nov 2010 15:20:04 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 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:132987 Archived-At: Stefan Monnier writes: >> 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".