From unknown Fri Aug 15 20:58:26 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11096: 24.0.94; vc-ediff: Minor improvements Resent-From: Jambunathan K Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 26 Mar 2012 07:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11096 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 11096@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.133274807019661 (code B ref -1); Mon, 26 Mar 2012 07:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2012 07:47:50 +0000 Received: from localhost ([127.0.0.1]:39035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4ea-000571-Vn for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:47:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43601) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4e3-00056H-Am for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:47:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC49t-000792-EE for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:16:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:46339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49t-00078x-87 for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:16:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49r-000296-LX for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:16:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC49m-000787-Ob for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:16:03 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:33969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49m-00077k-Fd for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:15:58 -0400 Received: by pbcup15 with SMTP id up15so6099176pbc.0 for ; Mon, 26 Mar 2012 00:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type; bh=TSRFBwqmjyGqriPxNXQUd5h1lQuvzb4PJ6kDqNXMh6g=; b=eFgoS20tdtkXIZGYnz7eWCzcvXK2FM4QvPA7R5Z7GBc81xpQ/zkCwsfE+zGOsco6bY FupY6csDX/ijKh/qcHY3rFGpbT1Rl907XtOgth33m04upsymxFV6oTzpC/v71dfHzaXW PdKCbpiw0yqdXWBHcIHIj6zI1cm2Y87+ReFWuF0VLyHWiWMKfrnLUoQ/00R4X7yEL+rY UXF9Nvp892HDneU3PJ09DTzIcvPOrV6kLqfNK1piiU+WCH0oQ/vOuZqnuAldrMpPNIxP dUY0hvdQ+NZGJKs8FiN0FympzrpLfzEkSJXMxuX3t5iqCSfTUIIToAn4rhM3g4CzCY0b H1OQ== Received: by 10.68.135.40 with SMTP id pp8mr50505034pbb.13.1332746156493; Mon, 26 Mar 2012 00:15:56 -0700 (PDT) Received: from JAMBU-NETBOOK ([115.242.252.109]) by mx.google.com with ESMTPS id j10sm5377445pbf.0.2012.03.26.00.15.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 00:15:55 -0700 (PDT) From: Jambunathan K Date: Mon, 26 Mar 2012 12:45:46 +0530 Message-ID: <818vin25p9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) Thanks a lot for vc-ediff. It is quite useful. Some suggestions: 1. Emulate vc-diff and report a helpful message if the file in question has no changes. ,---- *Messages* | No changes between working revision and workfile `---- 2. The following message is confusing and the y-or-n prompt is a minor annoyance. ,---- *Messages* | File org-e-odt.el.~master~ changed on disk. Reread from disk? (y or n) y `---- Attachments =========== ,---- Behaviour of vc-diff when file is unmodified | Finding changes in c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el... | Running git diff-index --exit-code -p HEAD -- org-e-odt.el in foreground... | Running git diff-index --exit-code -p HEAD -- org-e-odt.el...OK = 0 | No changes between working revision and workfile `---- ,---- Behaviour of vc-ediff when file is unmodified | Finding changes in c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el... | Checking out c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el.~master~... | Running git cat-file blob HE... ....OK = 0 | Checking out c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el.~master~...done | File org-e-odt.el.~master~ changed on disk. Reread from disk? (y or n) y | Computing differences between org-e-odt.el.~master~ and org-e-odt.el ... | Processing difference regions ... done | Quit this Ediff session? (y or n) y `---- From unknown Fri Aug 15 20:58:26 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11096: Acknowledgement (24.0.94; vc-ediff: Minor improvements) Resent-From: Jambunathan K Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 26 Mar 2012 08:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11096 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 11096@debbugs.gnu.org Received: via spool by 11096-submit@debbugs.gnu.org id=B11096.133274893721066 (code B ref 11096); Mon, 26 Mar 2012 08:03:02 +0000 Received: (at 11096) by debbugs.gnu.org; 26 Mar 2012 08:02:17 +0000 Received: from localhost ([127.0.0.1]:39042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4sb-0005Ti-1a for submit@debbugs.gnu.org; Mon, 26 Mar 2012 04:02:17 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:46203) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4sG-0005T0-ST for 11096@debbugs.gnu.org; Mon, 26 Mar 2012 04:02:16 -0400 Received: by pbbrq13 with SMTP id rq13so5242876pbb.3 for <11096@debbugs.gnu.org>; Mon, 26 Mar 2012 00:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; bh=Fn25duZ7bsVf1t0ihuZ/6fU8oK4dewCFgxqNIc9qRU0=; b=Xx9B2sMoShZN1pj1Fj4C3x2EAOsJRqOpN+eRaDfMI6raNiEsj1kKWVLj62XopBx77d VnNUzoNgvzl1APr9apS+GDfjHezbNdbCq766uBH9CbDjHj/+MgTde9ctkJ6lh21BYld9 EuTIxC97vnyE4mV8Ys/ttS2xfj1GFHr4vLIGaMb5TOB5hkdZWSFJSqvXXC/pWWmVGeT9 qUH0S0Hsqv8LOqaKOm3pU3z2s3eCSc5U6oFBNd4MnKUk1NM6Fr0cj/vk5n8eQ0lKk3+O QNBHiVU22+O/I2/IbRkvabz0d3UKwr+kxIz2QrH28wUuOU/VmGZut1LXOGD3FMGiLeCJ uS7Q== Received: by 10.68.225.104 with SMTP id rj8mr50583823pbc.135.1332747047457; Mon, 26 Mar 2012 00:30:47 -0700 (PDT) Received: from JAMBU-NETBOOK ([115.242.252.109]) by mx.google.com with ESMTPS id n6sm11911050pbb.59.2012.03.26.00.30.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 00:30:46 -0700 (PDT) From: Jambunathan K References: <818vin25p9.fsf@gmail.com> Date: Mon, 26 Mar 2012 13:00:37 +0530 In-Reply-To: (GNU bug Tracking System's message of "Mon, 26 Mar 2012 07:48:02 +0000") Message-ID: <81iphr7raa.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (windows-nt) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) > 2. The following message is confusing and the y-or-n prompt is a minor > annoyance. > ,---- *Messages* > | File org-e-odt.el.~master~ changed on disk. Reread from disk? (y or n) y > `---- This apparently happens when the file has modifications and happens on each invocation. From unknown Fri Aug 15 20:58:26 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jambunathan K Subject: bug#11096: closed (Re: bug#11096: 24.0.94; vc-ediff: Minor improvements) Message-ID: References: <87fvqyi734.fsf@gmail.com> <818vin25p9.fsf@gmail.com> X-Gnu-PR-Message: they-closed 11096 X-Gnu-PR-Package: emacs Reply-To: 11096@debbugs.gnu.org Date: Fri, 15 Nov 2013 05:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1384492262-9287-1" This is a multi-part message in MIME format... ------------=_1384492262-9287-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11096: 24.0.94; vc-ediff: Minor improvements which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 11096@debbugs.gnu.org. --=20 11096: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11096 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1384492262-9287-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 11096-done) by debbugs.gnu.org; 15 Nov 2013 05:10:25 +0000 Received: from localhost ([127.0.0.1]:53640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhBfk-0002Oe-Rl for submit@debbugs.gnu.org; Fri, 15 Nov 2013 00:10:25 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:52731) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhBfj-0002OP-7x for 11096-done@debbugs.gnu.org; Fri, 15 Nov 2013 00:10:23 -0500 Received: by mail-pa0-f46.google.com with SMTP id rd3so3102389pab.5 for <11096-done@debbugs.gnu.org>; Thu, 14 Nov 2013 21:10:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; bh=J031GXewnaACqsprHRq7ZhAivpOG36ggI7TgI07VQ78=; b=QnanSdJll3wlSh5f5asy1SESbjM8KYF9+RDsp9CRui0XtIhGY95T3b5Gr/tV5uX6kq ewnQyPwCXcF2V1O6+a6WId7Cndv18iySmEJpL6TcUrpa0L6kxGZBgHSCDyXPUi4wcnbc HfdXt44U8UqQg+zoDSiwOOIr5cDfxPA8BvxDRHaOW0Fy2AUulFP9aq1PxPglr0/Z87AJ xSC8qPCmrbq/L2IalazTDoQ8jsrCrF18snmJlL32uoO4wGFTR3Yue8to8TGfyx+KypWv 2/D0fI5Sgf9NAoiuEqTZD7ngAT6lcX0seujSd2TvKFfF5ju+Aqoutt+Rm4OytHCLLcJg Dw8w== X-Received: by 10.66.192.198 with SMTP id hi6mr3466574pac.87.1384492217704; Thu, 14 Nov 2013 21:10:17 -0800 (PST) Received: from debian-6.05 ([115.241.27.214]) by mx.google.com with ESMTPSA id b3sm1581684pbu.38.2013.11.14.21.10.15 for <11096-done@debbugs.gnu.org> (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 21:10:17 -0800 (PST) From: Jambunathan K To: 11096-done@debbugs.gnu.org Subject: Re: bug#11096: 24.0.94; vc-ediff: Minor improvements References: <818vin25p9.fsf@gmail.com> Date: Fri, 15 Nov 2013 10:39:51 +0530 In-Reply-To: <818vin25p9.fsf@gmail.com> (Jambunathan K.'s message of "Mon, 26 Mar 2012 12:45:46 +0530") Message-ID: <87fvqyi734.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 11096-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) OP here. Closed. ------------=_1384492262-9287-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Mar 2012 07:47:50 +0000 Received: from localhost ([127.0.0.1]:39035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4ea-000571-Vn for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:47:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43601) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SC4e3-00056H-Am for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:47:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC49t-000792-EE for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:16:06 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:46339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49t-00078x-87 for submit@debbugs.gnu.org; Mon, 26 Mar 2012 03:16:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49r-000296-LX for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:16:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC49m-000787-Ob for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:16:03 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:33969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC49m-00077k-Fd for bug-gnu-emacs@gnu.org; Mon, 26 Mar 2012 03:15:58 -0400 Received: by pbcup15 with SMTP id up15so6099176pbc.0 for ; Mon, 26 Mar 2012 00:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type; bh=TSRFBwqmjyGqriPxNXQUd5h1lQuvzb4PJ6kDqNXMh6g=; b=eFgoS20tdtkXIZGYnz7eWCzcvXK2FM4QvPA7R5Z7GBc81xpQ/zkCwsfE+zGOsco6bY FupY6csDX/ijKh/qcHY3rFGpbT1Rl907XtOgth33m04upsymxFV6oTzpC/v71dfHzaXW PdKCbpiw0yqdXWBHcIHIj6zI1cm2Y87+ReFWuF0VLyHWiWMKfrnLUoQ/00R4X7yEL+rY UXF9Nvp892HDneU3PJ09DTzIcvPOrV6kLqfNK1piiU+WCH0oQ/vOuZqnuAldrMpPNIxP dUY0hvdQ+NZGJKs8FiN0FympzrpLfzEkSJXMxuX3t5iqCSfTUIIToAn4rhM3g4CzCY0b H1OQ== Received: by 10.68.135.40 with SMTP id pp8mr50505034pbb.13.1332746156493; Mon, 26 Mar 2012 00:15:56 -0700 (PDT) Received: from JAMBU-NETBOOK ([115.242.252.109]) by mx.google.com with ESMTPS id j10sm5377445pbf.0.2012.03.26.00.15.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Mar 2012 00:15:55 -0700 (PDT) From: Jambunathan K To: bug-gnu-emacs@gnu.org Subject: 24.0.94; vc-ediff: Minor improvements Date: Mon, 26 Mar 2012 12:45:46 +0530 Message-ID: <818vin25p9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) Thanks a lot for vc-ediff. It is quite useful. Some suggestions: 1. Emulate vc-diff and report a helpful message if the file in question has no changes. ,---- *Messages* | No changes between working revision and workfile `---- 2. The following message is confusing and the y-or-n prompt is a minor annoyance. ,---- *Messages* | File org-e-odt.el.~master~ changed on disk. Reread from disk? (y or n) y `---- Attachments =========== ,---- Behaviour of vc-diff when file is unmodified | Finding changes in c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el... | Running git diff-index --exit-code -p HEAD -- org-e-odt.el in foreground... | Running git diff-index --exit-code -p HEAD -- org-e-odt.el...OK = 0 | No changes between working revision and workfile `---- ,---- Behaviour of vc-ediff when file is unmodified | Finding changes in c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el... | Checking out c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el.~master~... | Running git cat-file blob HE... ....OK = 0 | Checking out c:/Documents and Settings/kjambunathan/My Documents/My Data/src/org-mode/EXPERIMENTAL/org-e-odt.el.~master~...done | File org-e-odt.el.~master~ changed on disk. Reread from disk? (y or n) y | Computing differences between org-e-odt.el.~master~ and org-e-odt.el ... | Processing difference regions ... done | Quit this Ediff session? (y or n) y `---- ------------=_1384492262-9287-1--