[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ELPA update

From: Julien Danjou
Subject: Re: ELPA update
Date: Thu, 29 Sep 2011 16:09:07 +0200
User-agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.90 (gnu/linux)

On Thu, Sep 29 2011, Ted Zlatanov wrote:

> In Git you can cherry-pick between branches, which makes a new commit ID
> but the patch contents (including the commit message) are the same.  So
> that lets you take just one change from one branch to another.  It's not
> ideal but it's very easy to use and automate.

Let's hope nobody will ever modify more than one file/package in a
commit. Or your strategy will begin to be much more complicated. :)

> If that's too complicated or undesirable in Bazaar and there's no other
> way to merge just a few commits from one branch to another, I'm open to
> suggestions.  I still feel, no matter the merge mechanism, that we
> should use the VCS branch and not the package version as the deciding
> factor whether to publish a package.

I do not disagree, this is actually kind of how the Linux kernel is
handled if you look at it that way.

But since there's only 2 branches (stable/dev) I'm just not sure it's
the best approach here:
- merging parts of -dev branch into a -stable branch is complicated
- tagging a branch when it's ready to be publish with so many packages
  is impossible since developement is happening there on multiple
  packages at the same time

At least, the solution to have a set of tags named "{$package}-ready"
which would move on commits will assure that each package is put into
ELPA at the right stage. You can even rollback by moving the tag.
(I'm just not sure bzr can handle that correctly, and that the bzr users
would not make mistakes)

Julien Danjou

Attachment: pgpaUv1tIqCVd.pgp
Description: PGP signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]