From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#58192: 28.2; RCS integration issue Date: Fri, 30 Sep 2022 15:24:06 +0300 Message-ID: <83edvtdp95.fsf@gnu.org> References: <<4ef14f4b-860f-41df-a785-4c3cca1d5e67@dla-marbach.de>> <<83mtahdtuz.fsf@gnu.org>> <36ba9fa6-e6fd-4d39-8279-785c7ae270b2@dla-marbach.de> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1286"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 58192@debbugs.gnu.org To: "Meyer, Thomas" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 30 14:27:14 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oeF6n-00006z-U3 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 30 Sep 2022 14:27:14 +0200 Original-Received: from localhost ([::1]:51888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeF6n-0002mN-0F for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 30 Sep 2022 08:27:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeF4g-0001fr-Da for bug-gnu-emacs@gnu.org; Fri, 30 Sep 2022 08:25:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeF4g-0001l8-44 for bug-gnu-emacs@gnu.org; Fri, 30 Sep 2022 08:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oeF4f-0000wd-OC for bug-gnu-emacs@gnu.org; Fri, 30 Sep 2022 08:25:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 30 Sep 2022 12:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58192 X-GNU-PR-Package: emacs Original-Received: via spool by 58192-submit@debbugs.gnu.org id=B58192.16645406743587 (code B ref 58192); Fri, 30 Sep 2022 12:25:01 +0000 Original-Received: (at 58192) by debbugs.gnu.org; 30 Sep 2022 12:24:34 +0000 Original-Received: from localhost ([127.0.0.1]:40685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeF4D-0000vm-Un for submit@debbugs.gnu.org; Fri, 30 Sep 2022 08:24:34 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:46818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeF49-0000vU-7U for 58192@debbugs.gnu.org; Fri, 30 Sep 2022 08:24:31 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:44840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeF41-0001XA-GM; Fri, 30 Sep 2022 08:24:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=v12hVbL0tPG5Kcbwuc7e2NtaD0DfFJSgm1txNlPK29w=; b=iRQxpGulwjDa hlek1V93LgamFG5GPERV20qPOO1JdR32kawr7UDvil0ORgOTIluwBNFhjrU2FHpzOXmrrXi0gNf7c csPfpn/XUZlxp3cjX0+n3sWI/Gckp+yylNMvgFQ/K0ZtOkEMv2eZMcy9iRP+p76uJ/T/ZuZzjKdcb p2OmH9Hy+ORskdsmv7I+4BIE8bfBQ+L91pibYs+uCcmb8oC5UJdDeI8Z3qFaNiU5Zq+ERBKS1wa7/ +A729aeZtKTIbETKmKnZDs2MXkbH6RaehD4JFxdK55HUwVCmsOVZ61av85wbxO/U412X2YaeldcRo eG7GCFFsvZZIPMIXRUPTGw==; Original-Received: from [87.69.77.57] (port=1535 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeF40-0004ox-Vf; Fri, 30 Sep 2022 08:24:21 -0400 In-Reply-To: <36ba9fa6-e6fd-4d39-8279-785c7ae270b2@dla-marbach.de> (Thomas.Meyer@dla-marbach.de) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:243993 Archived-At: [Please use Reply All to keep the bug tracker on the CC list.] > Date: Fri, 30 Sep 2022 13:56:06 +0200 (CEST) > From: "Meyer, Thomas" > > Eli, > > yes, I missed some information, the word "bla" was typed in as > comment/summary for the commit. > > Here the full details of my actions: > > To reproduce: > > find new file in new directory > C-x v v (vc-next-action) > Registration will work fine (Registering > (c:/Users/meyert/Documents/RCS-test/a.txt)... done) > change file (inserted a new line) > save file > C-x v v (vc-next-action) -> first error: a checkout is done, erasing the changes This is not an error: with RCS you must check-out the file before you can modify it, because RCS is a locking VCS. Don't you see the buffer displayed as read-only (with "%%" in the mode line) before you check-out the file? > change file again (inserted a new line) > save file > C-x v v (vc-next-action) > Buffer *vc-log* prompts for a summary > Enter "Bla" as summary > C-c C-c (log-edit-done) > check-in fails: > > Buffer *vc* displays the following content: > > c:\Users\meyert\Documents\RCS-test>c:\cygwin64\bin\rcs.exe ci -j -u1 "-mSummary: Bla > ci: no input file > ci aborted > > Buffer *Messages* reports > > Checking in c:/Users/meyert/Documents/RCS-test/a.txt... > progn: Failed (status 1): ci -j -u1 -mSummary: Bla > RCS/a.txt,v > > interstingly, the buried buffer *vc-log* display a line break after the "Bla", that I never entered! That is the problem: you need to find out how that happened. Windows shell doesn't support newlines embedded in command lines. It doesn't happen in my case, FWIW. > d=`echo "$0" | sed 's|[^/]*$||'` > exec "$d"rcs ci "$@" > > # ci ends here > > These wrappers are available only in the Cygwin shell, so we need > Windows wrappers, e.g. > > ci.cmd > > c:\cygwin64\bin\bash -c '/bin/%~n0 %*' It's possible that the newline gets added as result of these multiple indirections. Or maybe something else is at work here: with my setup, which uses just ci.exe, I cannot reproduce the problem. Perhaps stepping with Edebug through vc-rcs-checking would reveal something? Do you see the variable 'comment' there having the newline? > If you know better ways of coupling Emacs on Windows with Cygwin, > please let me know. > > Other free ports of RCS on windows are older than dirt, I fear. Well, I'm a happy long-time user of RCS 5.7.1 ;-) > I might add that the same emacs install has no problems when > performing git integration. > > Kind regards, Thomas