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: Fri, 29 Jan 2010 12:50:13 +0200 Message-ID: <83wrz1rxqy.fsf@gnu.org> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> <873a1qt32z.fsf@telefonica.net> <83aavyt0bt.fsf@gnu.org> <201001290200.o0T200xh010567@godzilla.ics.uci.edu> <83y6jhs2b6.fsf@gnu.org> <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> 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 1264762461 13185 80.91.229.12 (29 Jan 2010 10:54:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 10:54:21 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 29 11:54:16 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 1NaoUR-0005K0-7x for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 11:54:16 +0100 Original-Received: from localhost ([127.0.0.1]:54201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaoUQ-0000AY-P8 for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 05:54:14 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaoQl-0007WT-J2 for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:50:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaoQi-0007VS-3J for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:50:27 -0500 Original-Received: from [199.232.76.173] (port=41778 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaoQh-0007VM-MZ for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:50:23 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:57649) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaoQh-000576-6H for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:50:23 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KX000A008M21W00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 29 Jan 2010 12:50:13 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KX00021C8RO26P0@a-mtaout20.012.net.il>; Fri, 29 Jan 2010 12:50:13 +0200 (IST) In-reply-to: <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> 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:120639 Archived-At: > Date: Fri, 29 Jan 2010 01:40:00 -0800 (PST) > From: Dan Nicolaescu > Cc: ofv@wanadoo.es, emacs-devel@gnu.org >=20 > Eli Zaretskii writes: >=20 > > > Date: Thu, 28 Jan 2010 18:00:00 -0800 (PST) > > > From: Dan Nicolaescu > > > Cc: =C3=93scar Fuentes , emacs-devel@gnu.org > > >=20 > > > > And the merge was done from VC or from the command line? = If the > > > > former, perhaps VC should suggest a commit right after th= e merge, and > > > > then do it without paying attention to point position. > > >=20 > > > I am not sure that's easy/good/feasible. > > >=20 > > > Can this condition be detected somehow? > >=20 > > You mean, the condition that there are pending uncommitted merg= es? >=20 > Yep Seems like one of these will do: . "bzr status" says, among other things, "pending merge tips" . "bzr status -v" shows all the pending merges, 1 line per merge. . "bzr status -S" shows the pending merges in a shorter format. Note that "bzr status FILE1 FILE2 ...", i.e. if you name some files explicitly, does not show the pending merges, even if those files are part of the uncommitted revisions merged from the other branch. Here're the examples: eliz@fencepost:~/bzr/emacs/bidi$ bzr status modified: admin/notes/bugtracker doc/lispref/ChangeLog doc/lispref/display.texi ... src/xfns.c unknown: src/TAGS-LISP pending merge tips: (use -v to see all merge revisions) <<<<<<<<<= << Glenn Morris 2010-01-28 Explain mbox folder links. eliz@fencepost:~/bzr/emacs/bidi$ bzr status -v modified: admin/notes/bugtracker doc/lispref/ChangeLog doc/lispref/display.texi ... src/xfns.c unknown: src/TAGS-LISP pending merges: <<<<<<<<<<<<<<<<<<<<<<<<< Glenn Morris 2010-01-28 Explain mbox folder links. =09Stefan Monnier 2010-01-28 Fix up spurious execute-bit on net/tramp= .el =09Michael Albinus 2010-01-28 * net/ange-ftp.el (ange-ftp-insert-dire= ctory)... =09Chong Yidong 2010-01-28 * arc-mode.el (archive-zip-extract): Quote= the a... =09... =09Chong Yidong 2010-01-25 Fix erc reconnection via non-default conne= ctors ... eliz@fencepost:~/bzr/emacs/bidi$ eliz@fencepost:~/bzr/emacs/bidi$ bzr status -S M admin/notes/bugtracker M doc/lispref/ChangeLog M doc/lispref/display.texi ... M src/m/mips.h P Glenn Morris 2010-01-28 Explain mbox folder links. <<<<<<<<<= <<<