GNU bug report logs -
#24303
Lets use git-subtree to import undo-tree into elpa
Previous Next
Reported by: Jonas Bernoulli <jonas <at> bernoul.li>
Date: Wed, 24 Aug 2016 21:32:02 UTC
Severity: wishlist
Done: Lars Ingebrigtsen <larsi <at> gnus.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 24303 in the body.
You can then email your comments to 24303 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#24303
; Package
emacs
.
(Wed, 24 Aug 2016 21:32:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Jonas Bernoulli <jonas <at> bernoul.li>
:
New bug report received and forwarded. Copy sent to
bug-gnu-emacs <at> gnu.org
.
(Wed, 24 Aug 2016 21:32:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
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
Information forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#24303
; Package
emacs
.
(Fri, 02 Sep 2016 13:37:02 GMT)
Full text and
rfc822 format available.
Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):
I would like to point out, that besides improvements to the
documentation the upstream also contains the following bug fix:
https://github.com/tarsius/undo-tree/commit/43663f6c22bb4e4bd42e6b5c57978bd303374b1c
That is not included in Elpa. (I am linking to my own fork of
upstream here, because the upstream repository cannot be looked
at in a browser.)
Information forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#24303
; Package
emacs
.
(Fri, 02 Sep 2016 13:46:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 24303 <at> debbugs.gnu.org (full text, mbox):
Jonas Bernoulli <jonas <at> bernoul.li> writes:
> I would like to point out, that besides improvements to the
> documentation the upstream also contains the following bug fix:
>
> https://github.com/tarsius/undo-tree/commit/43663f6c22bb4e4bd42e6b5c57978bd303374b1c
>
> That is not included in Elpa. (I am linking to my own fork of
> upstream here, because the upstream repository cannot be looked
> at in a browser.)
As well as subtree, you could put undo-tree into ELPA as an orphan
branch. Then you just push to update.
Phil
Information forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#24303
; Package
emacs
.
(Tue, 06 Jul 2021 15:49:01 GMT)
Full text and
rfc822 format available.
Message #14 received at 24303 <at> debbugs.gnu.org (full text, mbox):
Jonas Bernoulli <jonas <at> bernoul.li> writes:
> I think these two issues are related and would like to suggest that
> `git subtree' be used from now on.
How GNU ELPA works was changed substantially recently -- every package
is its own branch, which should make this stuff easier to handle.
So I'm closing this bug report.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
bug closed, send any further explanations to
24303 <at> debbugs.gnu.org and Jonas Bernoulli <jonas <at> bernoul.li>
Request was from
Lars Ingebrigtsen <larsi <at> gnus.org>
to
control <at> debbugs.gnu.org
.
(Tue, 06 Jul 2021 15:49:02 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Wed, 04 Aug 2021 11:24:03 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 262 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.