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 21:56:47 +0200 Message-ID: <83d40ssn0g.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> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> <201001291729.o0THTFam010863@godzilla.ics.uci.edu> <87ljfgdatj.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 1264795025 20188 80.91.229.12 (29 Jan 2010 19:57:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 19:57:05 +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 Fri Jan 29 20:57:02 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 1Nawxe-0004W0-QA for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 20:56:59 +0100 Original-Received: from localhost ([127.0.0.1]:35345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nawxe-0001Ru-8T for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 14:56:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NawxY-0001Qp-SM for emacs-devel@gnu.org; Fri, 29 Jan 2010 14:56:52 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NawxT-0001Nj-V7 for emacs-devel@gnu.org; Fri, 29 Jan 2010 14:56:52 -0500 Original-Received: from [199.232.76.173] (port=58424 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NawxT-0001Nc-Rn for emacs-devel@gnu.org; Fri, 29 Jan 2010 14:56:47 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:42047) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NawxT-00008v-0s for emacs-devel@gnu.org; Fri, 29 Jan 2010 14:56:47 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KX000000XYCSC00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 29 Jan 2010 21:56:46 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KX000L07Y2LC7B0@a-mtaout21.012.net.il>; Fri, 29 Jan 2010 21:56:46 +0200 (IST) In-reply-to: <87ljfgdatj.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:120670 Archived-At: > From: =C3=93scar Fuentes > Date: Fri, 29 Jan 2010 19:29:12 +0100 >=20 > > +=09(propertize "Pending merges, commit recommended before any ot= her action" > > +=09=09 'help-echo "Explain here what is going on" > > +=09=09 'face 'font-lock-warning-face)))))) >=20 > 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. I disagree. I think this recommendation is a good idea. Maybe just change the wording slightly: Pending merges, commit recommended before any further development > 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. Well, the modified wording covers that, I think.