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 19:29:12 +0100 Message-ID: <87ljfgdatj.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> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> <201001291729.o0THTFam010863@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 1264789792 30856 80.91.229.12 (29 Jan 2010 18:29:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 18:29:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 29 19:29:49 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 1NavbI-00026x-VI for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 19:29:49 +0100 Original-Received: from localhost ([127.0.0.1]:45700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NavbI-0002El-9i for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 13:29:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NavbC-0002Eb-1M for emacs-devel@gnu.org; Fri, 29 Jan 2010 13:29:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Navb6-0002Cs-93 for emacs-devel@gnu.org; Fri, 29 Jan 2010 13:29:40 -0500 Original-Received: from [199.232.76.173] (port=43918 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navb6-0002Cp-3t for emacs-devel@gnu.org; Fri, 29 Jan 2010 13:29:36 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:53596) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Navb5-0002Sk-K0 for emacs-devel@gnu.org; Fri, 29 Jan 2010 13:29:35 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Navb4-0001oN-21 for emacs-devel@gnu.org; Fri, 29 Jan 2010 19:29:34 +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 19:29:34 +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 19:29:34 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 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:UaN+eoRV7RRzXG0v0geEamZkIIY= 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:120664 Archived-At: Dan Nicolaescu writes: > > > Maybe it is a good idea to display the condition that there are > > > pending merges > > > > Display how? If in the modeline, then that indicator might not be > > prominent enough to draw the attention. > > I've already said that in a previous message: > "If yes, then vc-dir can insert a header to tell the user to do a commit > with no arguments." > > Here's an untested p [snip] > + (propertize "Pending merges, commit recommended before any other action" > + 'help-echo "Explain here what is going on" > + 'face 'font-lock-warning-face)))))) Saying that there are pending merges is enough. It is not VC-dir business to recommend what the user should or should not do, just provide the relevant information. And in this case the recommendation is misleading because, apart from commit, there are operations which are acceptable and useful when there is a pending merge: diff, revert, resolve, editing the changes, etc. What is not acceptable is a selective commit, and bzr already blocks that. Knowing that there is a pending merge is important, so this patch is very useful.