From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Fri, 29 Jan 2010 11:48:00 +0100 Message-ID: <87r5p9rxun.fsf@telefonica.net> 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264762207 12350 80.91.229.12 (29 Jan 2010 10:50:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 10:50:07 +0000 (UTC) Cc: Dan Nicolaescu To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 29 11:50:04 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 1NaoQK-0003Wq-PK for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 11:50:01 +0100 Original-Received: from localhost ([127.0.0.1]:52755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaoQK-0007Kh-2q for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 05:50:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaoOw-0006HN-Mj for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:48:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaoOq-0006Bm-02 for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:48:32 -0500 Original-Received: from [199.232.76.173] (port=41752 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaoOo-0006Ap-Da for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:48:26 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:55120) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaoOn-0004wO-PU for emacs-devel@gnu.org; Fri, 29 Jan 2010 05:48:26 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaoOk-0002vu-VZ for emacs-devel@gnu.org; Fri, 29 Jan 2010 11:48:22 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 29 Jan 2010 11:48:22 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 29 Jan 2010 11:48:22 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 39 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:FYehOHF1nbncW8zxO/s4xXfsvRc= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120637 Archived-At: Dan Nicolaescu writes: > > > > And the merge was done from VC or from the command line? If the > > > > former, perhaps VC should suggest a commit right after the merge, and > > > > then do it without paying attention to point position. > > > > > > I am not sure that's easy/good/feasible. > > > > > > Can this condition be detected somehow? > > > > You mean, the condition that there are pending uncommitted merges? Or > > Yep `bzr st' tells you: removed: admin/revdiff modified: .bzrignore ChangeLog admin/ChangeLog [...some output elided...] pending merge tips: (use -v to see all merge revisions) Chong Yidong 2010-01-28 * fileio.c (Frename_file): Fix last change (Bug#5487). or the short version, `bzr st -S' : M .bzrignore M ChangeLog M configure M configure.in [...some output elided...] P Chong Yidong 2010-01-28 * fileio.c (Frename_file): Fix last change (Bug#5487). Maybe it is a good idea to display the condition that there are pending merges (after all, you get that information along with the rest of the working tree state.) IMHO it is not a good idea to change VC-dir's behavior wrt point position for that state.