From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 28 Jan 2010 18:00:00 -0800 (PST) Message-ID: <201001290200.o0T200xh010567@godzilla.ics.uci.edu> 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> 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 1264730610 1805 80.91.229.12 (29 Jan 2010 02:03:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 Jan 2010 02:03:30 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 29 03:03:25 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 1NagCj-0006ID-6q for ged-emacs-devel@m.gmane.org; Fri, 29 Jan 2010 03:03:25 +0100 Original-Received: from localhost ([127.0.0.1]:37732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NagCi-0004SI-LI for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 21:03:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NagCc-0004Rv-FJ for emacs-devel@gnu.org; Thu, 28 Jan 2010 21:03:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NagCX-0004RT-2q for emacs-devel@gnu.org; Thu, 28 Jan 2010 21:03:17 -0500 Original-Received: from [199.232.76.173] (port=38356 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NagCW-0004RQ-T3 for emacs-devel@gnu.org; Thu, 28 Jan 2010 21:03:12 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]:42261) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NagCU-0001B8-Af; Thu, 28 Jan 2010 21:03:10 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o0T201cw006403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 28 Jan 2010 18:00:01 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o0T200xh010567; Thu, 28 Jan 2010 18:00:00 -0800 (PST) In-Reply-To: <83aavyt0bt.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 28 Jan 2010 22:56:54 +0200") Original-Lines: 23 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o0T201cw006403 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu 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:120624 Archived-At: Eli Zaretskii writes: > > From: =C3=93scar Fuentes > > Date: Thu, 28 Jan 2010 20:57:24 +0100 > >=20 > > Eli Zaretskii writes: > >=20 > > > Are you saying that this happened because a "merge" was not followed > > > by a "commit", and only because of that? > >=20 > > Jan tried to commit after the merge, but somehow VC-dir passed some > > file names to the command instead of doing a non-selective commit as = he > > intended. >=20 > 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? If yes, then vc-dir can insert a header to tell the user to do a commit with no arguments.