bug#24303: Lets use git-subtree to import undo-tree into elpa

bug#24303: Lets use git-subtree to import undo-tree into elpa

[Jonas Bernoulli]

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

bug#24303: Lets use git-subtree to import undo-tree into elpa

[Jonas Bernoulli]

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.)

bug#24303: Lets use git-subtree to import undo-tree into elpa

[Phillip Lord]

Jonas Bernoulli <jonas@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

bug#24303: Lets use git-subtree to import undo-tree into elpa

[Lars Ingebrigtsen]

Jonas Bernoulli <jonas@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