From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.devel Subject: Re: [elpa]: I possibly broke something Date: Wed, 02 Dec 2015 18:38:48 +0100 Message-ID: <87io4g21jr.fsf@web.de> References: <121575.12777.bm@smtp201.mail.bf1.yahoo.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1449077956 19437 80.91.229.3 (2 Dec 2015 17:39:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2015 17:39:16 +0000 (UTC) Cc: emacs-devel To: mr_rookes@yahoo.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 18:39:04 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 1a4BMu-0007eJ-0I for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2015 18:39:04 +0100 Original-Received: from localhost ([::1]:59565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4BMt-0001pY-EH for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2015 12:39:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4BMp-0001k5-BL for emacs-devel@gnu.org; Wed, 02 Dec 2015 12:39:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4BMm-0008MV-C0 for emacs-devel@gnu.org; Wed, 02 Dec 2015 12:38:59 -0500 Original-Received: from mout.web.de ([212.227.17.11]:54693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4BMm-0008Ln-3O for emacs-devel@gnu.org; Wed, 02 Dec 2015 12:38:56 -0500 Original-Received: from drachen.dragon ([90.186.3.135]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MS290-1Zsf333TCc-00TDUG; Wed, 02 Dec 2015 18:38:52 +0100 In-Reply-To: <121575.12777.bm@smtp201.mail.bf1.yahoo.com> (mr rookes's message of "Wed, 02 Dec 2015 18:17:16 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:0fe5ONdcuqPhF3PNHky4bmPMD7trtWPplMp14mmuWBF6YWxL43I TDQRudrWNHt6faRJlidv+GMW61buus2lUGnzWTIHZU4Oru1/iyLKlfOuquR1pozxcFbsDr7 96fM9pdnkOxnwiQfY1IdGhlZS8rpDi+ena2c2PTV8zx9862iL0hHhg/RqEmDVwQ8rjBlQtf B+TNevRFVK21jez2cAdCQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:8WlW3YKiKaA=:2l5GSd2e4MESNH1FbEq5Ks iPp5rLcofW/++ZDONketC/snpFu6KQL63XS+VgHey9OU8KnCeZILQkrPrMltO9DCLw7Xr0roK rsd2oYzK1/79mGYtgPcCUwb6pTNfkF3mJDaujaMd0kGV7HBBe3oJ5pVioxMdH1Ay0n0vIcWPN CcZlHkYDiPr5l09Ae2mf7S56wVupFEXKukHiIoi7ddNFU4RRwYPKOoMFJe8aFJYBX5UG+TuRk NXxY0BPpgV/7PqKFdn/gIrkfFw3FDpB5fe12B5dnkIc3Rm3xkWw5j8LURAxInQZHe2/GBZvII D2j7sPmk4A0IwJnzkv6aS+7QMSQ9rxEYLPtntACQdK48zADq/HLlqW2RB0999T9/LfcuqtAzQ E1vcmxLMCIJ4o6r4KaSD2JB9+K7SYdjUP36LG+Bq6XgT0LuVk89VFbsfMPWvUlNjE+3YZq2Wh z/b5WCPjn5AADGPOyYpNpX2JY2f23YhQAGJESW0HiDgaPIEzpCnGTuSf8sNI0lk7qgBVI3ONO wjc77E7BPmcBollc8EbQi4AVvmWsb4GwNDVTUOHKVoPnvLnOe21Fxh325ukdNT1pzWGo5rcZH ECokR/8Z5guXyXamRagXKCG7b2asubFMRXC7PXoQNU+bktyjeEK2eyLAyLgdXQoMTB3fuDAWz pL4S/QBxrjLiSlIablI9w/cWJNY4h/EYG0YXO9Xv/qhkiYtkWkpWC85Q8WBS2LdS3vCH0hWyn xuJoIkORLkBu2XYSJKu7XQLhIX0lwlsPXCJOSW/6aoWrEQdtTBHmDjSyGYXDYt1HF+EInWmT X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.11 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:195768 Archived-At: mr_rookes@yahoo.com writes: > I don't know. I don't understand the output generated, but seems to be > related with other packages. What output? Seems you are referring to the changes relative to the first parent commit c523db of your merge commit. The changes you were actually uploading with the merge are the changes relative to the other parent commit of your merge, e565b5: --8<---------------cut here---------------start------------->8--- 1 file changed, 3 insertions(+), 3 deletions(-) packages/transcribe/transcribe.el | 6 +++--- modified packages/transcribe/transcribe.el @@ -110,15 +110,15 @@ " Transcribe" '(([?\C-x ?\C-p] . emms-play-file) ([?\C-x ?\C-a] . transcribe-analyze-episode) - ([?\C-x ?\C-n] . 'NewEpisode) + ([?\C-x ?\C-n] . NewEpisode) ([?\C-x down] . emms-stop) ([?\C-x right] . emms-seek-forward) ([?\C-x left] . emms-seek-backward) ([f5] . emms-pause) ([f6] . transcribe-define-xml-tag) - ([f7] . 'transcribe-xml-tag-l2-break) + ([f7] . transcribe-xml-tag-l2-break) ([f8] . emms-seek) - ([f4] . 'transcribe-set-atributes) + ([f4] . transcribe-set-atributes) ([f11] . transcribe-xml-tag-l1) ([f12] . transcribe-xml-tag-l2)) --8<---------------cut here---------------end--------------->8--- That looks sane. > I just added, committed, pulled and pushed. At pulling, I was asked of > merging my changes, and I thought I could only change the files in my > git add. I think you did it right. Michael.