From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#11605: 24.1.50; vc-ediff revert annoyance Date: Fri, 26 Feb 2016 12:10:21 +0200 Message-ID: <85c450a4-ee43-b789-fbc5-8b095f633773@yandex.ru> References: <87twkybos7.fsf@gnus.org> <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1456481485 1902 80.91.229.3 (26 Feb 2016 10:11:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Feb 2016 10:11:25 +0000 (UTC) To: William Xu , 11605@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 26 11:11:17 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aZFMi-0002oa-M8 for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 11:11:16 +0100 Original-Received: from localhost ([::1]:48571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFMh-0003Cu-0v for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 05:11:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFMX-00034m-OU for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:11:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZFMU-0007J3-Gy for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:11:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZFMU-0007It-DC for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aZFMU-0003li-9g for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 05:11:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Feb 2016 10:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11605 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch confirmed Original-Received: via spool by 11605-submit@debbugs.gnu.org id=B11605.145648143014442 (code B ref 11605); Fri, 26 Feb 2016 10:11:02 +0000 Original-Received: (at 11605) by debbugs.gnu.org; 26 Feb 2016 10:10:30 +0000 Original-Received: from localhost ([127.0.0.1]:46927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZFLy-0003ks-9b for submit@debbugs.gnu.org; Fri, 26 Feb 2016 05:10:30 -0500 Original-Received: from mail-wm0-f47.google.com ([74.125.82.47]:35245) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZFLx-0003kg-Bv for 11605@debbugs.gnu.org; Fri, 26 Feb 2016 05:10:29 -0500 Original-Received: by mail-wm0-f47.google.com with SMTP id c200so65438387wme.0 for <11605@debbugs.gnu.org>; Fri, 26 Feb 2016 02:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=f8mS/NVKBX1gLEB2BUv2PFVHos3eW8p2Ew6xB+EYpKU=; b=TP5ip+5NDa5X8uAdC9dezmDr6DXVos5vOpeKYTRhdidVsVgTUb1WUz2hdXBSt/hwV6 6I4Dmv92Jq4PKbVqtnRaq6rLbE2r8dgXl3UMHb0UtwPRS0AHXfx/Oeas8P8iHiHN+nzJ mRXpZR0smr9RYszRxadJ7qHj1lJYgOahlIF+aPTLVWlf8B6xqYzyBbAOuJ1IY4jfYACm eZTpukpFcYYWAarGfbfWCSpguwBFNKU6u6a7oL21yNJcRyByv0/QfIcLUiLjHrWdYucw LsUx32nBQyfFqgN9EB9k3M+COVyM1EXtZX/uH+hMRBAkTD/b7utjztNhAzJ7XPyTNFp/ jQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=f8mS/NVKBX1gLEB2BUv2PFVHos3eW8p2Ew6xB+EYpKU=; b=NjG2Ki7XwcAYTdeZpbgkxi93czqEXLidaG8C7EqRqaCoYDWFAtHKfz91DaBYJzpfTB 8YJgufrvdTjwkNeUKxk7ajTPIxDlRYhM8NJiqh+bLFRoLadYMiwJ+cKy222yTmJ/JMgg iWdtUDKMQHP6Y5azPTVq2boxLkF8l4Zm+h4anq3RLzgSLnuuTKS6GcfmdOqH6G1AVDg7 Fi48wxXfekBuYzuESepehKoeUGcnsjv5uAHBntgvEfhKw44tteMt7aGh4YZFhqSuCWvj pRJ96HP1MBiW+Qxa5s462kHBB3757JnvnxQlX4NVcV2JI5ydpHH3MLBrOpzEsT5eYKov kTkA== X-Gm-Message-State: AD7BkJJcs/ewASdWJHc9pmIhOCEWOViTFsYGKzzGFA2arMGdMY+cR4dD/KWmO3/YaqXo7w== X-Received: by 10.194.78.148 with SMTP id b20mr768404wjx.71.1456481423763; Fri, 26 Feb 2016 02:10:23 -0800 (PST) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id fv6sm11779401wjc.12.2016.02.26.02.10.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Feb 2016 02:10:22 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113871 Archived-At: On 02/26/2016 11:38 AM, William Xu wrote: > It sounds strange that one would try to modify it. I thought the > checkout version is only for comparison. The file name XX.~yy~ looks > also very similar to automatic backup files, e.g., "!tmp!foo.cpp.~1~". I agree it is strange, but it's not out of the question. Maybe the user wants to restore an old version of a function, and on a whim, started retouching it in the "old version" buffer?