From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] emacs-25 5152b21 1/2: ; ChangeLog fixes Date: Sun, 24 Jan 2016 20:54:01 +0300 Message-ID: <56A50FB9.9030202@yandex.ru> References: <20160124123159.10057.13168@vcs.savannah.gnu.org> <56A4C51A.1040403@yandex.ru> <56A4E1D2.3000401@gmx.at> <56A4E82C.9030604@yandex.ru> <56A4F9FC.7050108@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1453658064 30466 80.91.229.3 (24 Jan 2016 17:54:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 24 Jan 2016 17:54:24 +0000 (UTC) To: martin rudalics , emacs-devel@gnu.org, Nicolas Petton Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 24 18:54:23 2016 Return-path: Envelope-to: ged-emacs-devel@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 1aNOrm-0002wl-5O for ged-emacs-devel@m.gmane.org; Sun, 24 Jan 2016 18:54:22 +0100 Original-Received: from localhost ([::1]:32993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNOrl-00065c-Cq for ged-emacs-devel@m.gmane.org; Sun, 24 Jan 2016 12:54:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNOrX-00063b-Ue for emacs-devel@gnu.org; Sun, 24 Jan 2016 12:54:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNOrU-0000T4-OE for emacs-devel@gnu.org; Sun, 24 Jan 2016 12:54:07 -0500 Original-Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]:36101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNOrU-0000T0-Fz for emacs-devel@gnu.org; Sun, 24 Jan 2016 12:54:04 -0500 Original-Received: by mail-lf0-x234.google.com with SMTP id h129so73147076lfh.3 for ; Sun, 24 Jan 2016 09:54:04 -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-type:content-transfer-encoding; bh=rspd2psUF8oygP+hDyjjFetKcnhp5UdjljNQiht8WA4=; b=K2BfDLdZRMUOP/PsYlbGV/sfJMjKZTeF+AHYf/jRjTju5RDUAxCvfyrO+KQWJVlkrA rS19Ad/71fRqD5gMj5ahDnG/Q//x8829oLHk31zRf1MHvRU08EB1ZHvsOBUeVkmKvMQf fQhYoYTaJqbUc30VBuq54W2jmV8zSH2qJubzuW6CotbTkDt2xZCJXPfWXxZv0RzWI2TV 44PZgO/kKFsyGnUsVXV0tJ37spfS+WWdDfeo4h2yumQt+6QKhMTLX695flKQ7ST5ciNx 226utl+7JthSICkEsNsfCGDMNHXlXtUyBVgTLTQMtjEdc9eNWlmG3xd/lc3/YCZi5x3b BdSg== 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-type :content-transfer-encoding; bh=rspd2psUF8oygP+hDyjjFetKcnhp5UdjljNQiht8WA4=; b=P3Fty383ujZNbBK5509bjoVzSyFG8QoPMQqt5OD38A2C62iyhfwTNVCCS58i1ICFIJ nDyH4/fej6GsnKbrmCa1BLQJxZCu6nUbi5gYRJ2iYu1+uXr592kg2ddANCK2ULerfAvB Lk3KlGeNJrA4auKLKT+GQjZ7cenIzcCQGTwhLi3+xzz4n6VQ/glLm5exoAkUWvsWpABB 3o+EcE/rfsu+ST0pQCLH2gHE5C2iwL1vMm8dnfdhm+ywTnwikkC2hnB53GodGqozn25z 1C3wIIsDXRd1AEdUHs8zKMuZPc69ds2KD7yIb1nWsR9XnrCdTo57ol+8NBAvxZ9y8Ain KTwQ== X-Gm-Message-State: AG10YOTVhKCMbiz3r++jO0/a48CbPtbLElqUAG6uz5sat9hhS5NDqb8fiRQtCkvhP6VHkA== X-Received: by 10.25.166.65 with SMTP id p62mr5340020lfe.51.1453658043387; Sun, 24 Jan 2016 09:54:03 -0800 (PST) Original-Received: from [192.168.1.190] ([178.252.127.222]) by smtp.googlemail.com with ESMTPSA id jx8sm2186244lbc.29.2016.01.24.09.54.01 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 24 Jan 2016 09:54:02 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:44.0) Gecko/20100101 Thunderbird/44.0 In-Reply-To: <56A4F9FC.7050108@gmx.at> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:198712 Archived-At: On 01/24/2016 07:21 PM, martin rudalics wrote: > I misread the diff. When I do ‘add-change-log-entry-other-window’ for a > file in another Emacs instance, it inserts the path relative to the > source directory of the current instance. So instead of something like > > * src/nsterm.m (windowDidResize:, toggleFullScreen:): > > I get, for example, something like > > * ../trunk/src/nsterm.m (windowDidResize:, toggleFullScreen:): > > in the ChangeLog file of my current instance. Which is implicitly > correct but hardly useful for the commit message. Any idea how that happens? There are no references to source-directory inside lisp/vc/. Maybe you've edited files in both branches (residing in different directories) in that session, and still keep the ChangeLog file from the other branch open?