From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: master ba5bc0e: Tramp: Disable paging with PAGER=cat. Date: Mon, 16 Feb 2015 08:58:12 +0100 Message-ID: <87y4nyjnjf.fsf@gmx.de> References: <20150215095811.27056.94005@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1424073515 27691 80.91.229.3 (16 Feb 2015 07:58:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 16 Feb 2015 07:58:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 16 08:58:26 2015 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 1YNGZW-000494-GX for ged-emacs-devel@m.gmane.org; Mon, 16 Feb 2015 08:58:26 +0100 Original-Received: from localhost ([::1]:38003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNGZW-0005Ns-3U for ged-emacs-devel@m.gmane.org; Mon, 16 Feb 2015 02:58:26 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNGZT-0005Nn-57 for emacs-devel@gnu.org; Mon, 16 Feb 2015 02:58:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNGZM-0007yQ-83 for emacs-devel@gnu.org; Mon, 16 Feb 2015 02:58:23 -0500 Original-Received: from mout.gmx.net ([212.227.15.18]:62565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNGZL-0007yF-UH; Mon, 16 Feb 2015 02:58:16 -0500 Original-Received: from detlef.gmx.de ([79.195.26.25]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MhiPD-1YAQPW2ZWN-00MrjE; Mon, 16 Feb 2015 08:58:13 +0100 In-Reply-To: (Glenn Morris's message of "Sun, 15 Feb 2015 19:31:34 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:+kBChcN0RCyjyNSL8Fa5vxSZwVJi3cqt7K3tAqtaDiq0sIw/VXa Pi6n2twj8wTxbcw7wV3LaVCLBAb1LhIJkPfPZwldNuJA5xodF7mlksnSyweB33pu+TEVSMa N/ygEb/hkcmxXfCGp9e1ifQ9DTLG/LL4RkLhvhdHZ9ARgquKX3GqhI8p00hPgdUaAWN6HK5 EgnCZz3TAOfQMC3y8QDSg== X-UI-Out-Filterresults: notjunk:1; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.18 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:183150 Archived-At: Glenn Morris writes: Hi Glenn, > It seems that you erased a bunch of existing ChangeLog entries? Yes, and I'm very sorry about. I'used a bound branch emacs-24 in parallel to the master branch. I experienced already problems from time to time when pushing commits upstream, and so I did yesterday as well. I'm pretty sure I have committed and pushed the changes to the emacs-24 branch; I have no idea how they did land in master. > (Also, you later made the same change on the emacs-24 branch, but did > not mark it as a backport. It's better to just make the change in that > branch if appropriate.) Well, as result of the yesterdays disaster, I've removed the bound emacs-24 branch on my laptop, and I've cloned it completely in parallel to the master branch. Hope this works better. I could revert the patch from the master branch, should I? Best regards, Michael.