From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jonas Bernoulli Newsgroups: gmane.emacs.bugs Subject: bug#24303: Lets use git-subtree to import undo-tree into elpa Date: Wed, 24 Aug 2016 23:30:44 +0200 Message-ID: <874m69dfcr.fsf@bernoul.li> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1472074343 25384 195.159.176.226 (24 Aug 2016 21:32:23 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 24 Aug 2016 21:32:23 +0000 (UTC) User-Agent: mu4e 0.9.17; emacs 25.1.1 To: 24303@debbugs.gnu.org, toby-undo-tree@dr-qubit.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 24 23:32:17 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcfmS-00061t-AM for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2016 23:32:16 +0200 Original-Received: from localhost ([::1]:53427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfmP-000371-MT for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2016 17:32:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfmJ-00036g-40 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:32:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcfmF-0007ol-0Z for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:32:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfmE-0007og-Tj for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bcfmE-00072b-K0 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jonas Bernoulli Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2016 21:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 24303 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org, Toby Cubitt Original-Received: via spool by submit@debbugs.gnu.org id=B.147207426726994 (code B ref -1); Wed, 24 Aug 2016 21:32:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Aug 2016 21:31:07 +0000 Original-Received: from localhost ([127.0.0.1]:39422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcflL-00071K-BL for submit@debbugs.gnu.org; Wed, 24 Aug 2016 17:31:07 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcflK-00070q-Ke for submit@debbugs.gnu.org; Wed, 24 Aug 2016 17:31:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcflE-0007f3-DW for submit@debbugs.gnu.org; Wed, 24 Aug 2016 17:31:01 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:37910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcflE-0007el-AY for submit@debbugs.gnu.org; Wed, 24 Aug 2016 17:31:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcflB-000356-Te for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:30:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcfl6-0007dH-O0 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:30:56 -0400 Original-Received: from mail.hostpark.net ([212.243.197.30]:47474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcfl6-0007cd-HB for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2016 17:30:52 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id 0C65116B41; Wed, 24 Aug 2016 23:30:49 +0200 (CEST) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Original-Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail1.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id LlDGpzoYiztK; Wed, 24 Aug 2016 23:30:48 +0200 (CEST) Original-Received: from hal (178-82-62-170.dynamic.hispeed.ch [178.82.62.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id D15DF16B42; Wed, 24 Aug 2016 23:30:48 +0200 (CEST) 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.x 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" Xref: news.gmane.org gmane.emacs.bugs:122609 Archived-At: Hello, I wanted to address some compiler warnings in undo-tree.el but in the process I noticed that the upstream repository and elpa are not in sync and that upstream changes aren't merged using `git subtree'. I think these two issues are related and would like to suggest that `git subtree' be used from now on. Because that isn't possible when the directory in question already exists we temporarily have to remove it. And we have to commit that change because otherwise `git subtree' would refuse to do anything. git rm -r packages/undo-tree git commit -m "Temporarily remove undo-tree So that it can be added again, this time using `git subtree'." Now we can add the subtree. The documentation in the README suggests that `--squash' should not be used, but there are already quite a few packages with are importing by squashing all upstream changes and doing it that way would result in something very similar to how it has been done manually for this package in the past (on the surface), so I think we might want use it here: git subtree add [--squash] --prefix=packages/undo-tree \ http://www.dr-qubit.org/git/undo-tree.git master >From now on new upstream changes can be imported like so: git subtree pull [--squash] --prefix=packages/undo-tree \ http://www.dr-qubit.org/git/undo-tree.git master Also note that in the upstream repository the "release/0.6.5" should be created. Best regards, Jonas