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 11:11:41 +0200 Message-ID: <83y6jhs2b6.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> 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 1264756718 27099 80.91.229.12 (29 Jan 2010 09:18:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 09:18:38 +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 10:18:35 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 1Namzq-0006ig-R8 for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 10:18:35 +0100 Original-Received: from localhost ([127.0.0.1]:54983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Namzq-0008FO-1g for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 04:18:34 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Namu0-0001NV-NN for emacs-devel@gnu.org; Fri, 29 Jan 2010 04:12:32 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Namtu-0001FL-VS for emacs-devel@gnu.org; Fri, 29 Jan 2010 04:12:31 -0500 Original-Received: from [199.232.76.173] (port=59724 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Namtu-0001F9-QL for emacs-devel@gnu.org; Fri, 29 Jan 2010 04:12:26 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:36044) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Namtu-0007xQ-Ag for emacs-devel@gnu.org; Fri, 29 Jan 2010 04:12:26 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KX0006004588U00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 29 Jan 2010 11:11:41 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KX000MG547GN8N0@a-mtaout20.012.net.il>; Fri, 29 Jan 2010 11:11:41 +0200 (IST) In-reply-to: <201001290200.o0T200xh010567@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:120631 Archived-At: > 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 th= e > > former, perhaps VC should suggest a commit right after the merg= e, 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? You mean, the condition that there are pending uncommitted merges? O= r the condition that the user is committing changes in specific files when there are pending uncommitted merges?