From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: vc-update for bzr etc. Date: Mon, 22 Nov 2010 19:59:29 +0200 Message-ID: <834ob99r3y.fsf@gnu.org> References: <87y68m7kdh.fsf@stupidchicken.com> <87lj4mk2e5.fsf@stupidchicken.com> <87mxp2bd12.fsf@stupidchicken.com> <87tyjauga0.fsf@stupidchicken.com> <87aal1wb21.fsf@stupidchicken.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1290448911 22701 80.91.229.12 (22 Nov 2010 18:01:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 22 Nov 2010 18:01:51 +0000 (UTC) Cc: dann@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 22 19:01:44 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 1PKahy-0005Ng-8k for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 19:01:42 +0100 Original-Received: from localhost ([127.0.0.1]:51489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKahx-0002CZ-NU for ged-emacs-devel@m.gmane.org; Mon, 22 Nov 2010 13:01:41 -0500 Original-Received: from [140.186.70.92] (port=37435 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKaht-0002CM-0a for emacs-devel@gnu.org; Mon, 22 Nov 2010 13:01:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKahr-0002Ay-TR for emacs-devel@gnu.org; Mon, 22 Nov 2010 13:01:36 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:60449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKahp-00029g-SA; Mon, 22 Nov 2010 13:01:34 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LCA00I00SJZ8800@a-mtaout21.012.net.il>; Mon, 22 Nov 2010 20:01:31 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.52.47]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LCA00H5RSQBZB50@a-mtaout21.012.net.il>; Mon, 22 Nov 2010 20:01:31 +0200 (IST) In-reply-to: <87aal1wb21.fsf@stupidchicken.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:133023 Archived-At: > From: Chong Yidong > Cc: monnier@iro.umontreal.ca, dann@gnu.org, emacs-devel@gnu.org > Date: Mon, 22 Nov 2010 11:57:42 -0500 > > Eli Zaretskii writes: > > > How do I do a "bzr merge --pull"? This is a very frequent operation > > in my workflows, when I work with local branches. > > We are going to need to provide a separate merge operation, I think. > > Although, even without that, this patch would allow you to do > `C-u C-x v +', which will prompt for the actual bzr command, and you > could change it to "bzr merge --pull". I actually wonder why shouldn't vc-merge invoke "bzr merge --pull" by default. What would be the disadvantage of that? If a pull is not possible, this command will merge anyway.