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: No commit in vc? Date: Thu, 28 Jan 2010 20:32:55 +0200 Message-ID: <837hr23wrs.fsf@gnu.org> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1264703614 21639 80.91.229.12 (28 Jan 2010 18:33:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 18:33:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 19:33:32 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 1NaZBH-0007T3-Lx for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 19:33:27 +0100 Original-Received: from localhost ([127.0.0.1]:33256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaZBH-0007zu-4H for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 13:33:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaZAy-0007vF-Vy for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:33:09 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaZAt-0007tH-US for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:33:08 -0500 Original-Received: from [199.232.76.173] (port=33272 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaZAt-0007tA-IN for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:33:03 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:34242) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaZAs-0003AL-6n for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:33:02 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KWY00D00ZGXXH00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Thu, 28 Jan 2010 20:32:48 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWY00A8DZINDNB0@a-mtaout21.012.net.il>; Thu, 28 Jan 2010 20:32:48 +0200 (IST) In-reply-to: <87vdemtk4g.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.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:120595 Archived-At: > From: =C3=93scar Fuentes > Date: Thu, 28 Jan 2010 14:49:19 +0100 >=20 > cd trunk > bzr merge ../other-branch > > >=20 > As mentioned on my response to Jason, it seems that bzr does not ad= mit a > `commit' comand with a list of files when there is a pending merge. =C3=93scar, could you please ask on the Bazaar list if this is true, = and what can be done to work around that, so that VC could DTRT? I'd ask myself, but I'm not sure I understand the details well enough to describe them in clear terms. TIA