Merge lp://staging/~jelmer/bzr-gtk/credits-pickle into lp://staging/bzr-gtk/gtk2

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/13/2011 8:15 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-gtk/credits-pickle into lp:bzr-gtk.
>
> Requested reviews:
> Bazaar GTK maintainers (bzr-gtk)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-gtk/credits-pickle/+merge/49545
>
> Update HACKING to document the process for landing branches.
>
> Include credits.pickle in the branch.

I wonder if you would want to "sort(list(d.iteritems()))" so that the
versioned pickle preserves ordering. Just a thought.

Personally, I really don't like versioning autogenerated output like
this. But I understand the alternative is creating it in a "clean"
target, which is just about as distasteful.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1ZY6kACgkQJdeBCYSNAAMQ/gCgxMEGtnIEC4C7u+gSY2ggW5mp
saMAoLx5s7oASoY+pLys3nwvcELzBeH3
=wviP
-----END PGP SIGNATURE-----

General nonspecific hating of versioned autogenerated files aside, isn't this going to be quite irksome for anyone merging trunk into an ongoing branch?

I really don't think we should do this.

OK, generating the file in debian/rules clean when on Ubuntu buildds and it does not exist already is an ... interesting ... solution, but it does work, and without the downside of more work for anyone doing merge operations on the project.

If people really dislike the debian/rules clean solution, I think the answer is to get the "run" recipe command enabled on Launchpad - it is, after all no less secure than this, IIUC.

On Tue, 2011-02-15 at 06:41 +0000, Max Bowsher wrote:
> General nonspecific hating of versioned autogenerated files aside,
> isn't this going to be quite irksome for anyone merging trunk into an
> ongoing branch?
Your original proposal also included versioning the credits.pickle file,
I don't see how this is any different?

This wouldn't affect ongoing branches, as credits.pickle would only be
updated in trunk.

The other thing this would fix is that people installing out of the
source tree need bzr-stats at the moment.

> I really don't think we should do this.

> OK, generating the file in debian/rules clean when on Ubuntu buildds
> and it does not exist already is an ... interesting ... solution, but
> it does work, and without the downside of more work for anyone doing
> merge operations on the project.
It means clean won't get us back to the original source tree, so it's
technically not compliant with policy.

> If people really dislike the debian/rules clean solution, I think the
> answer is to get the "run" recipe command enabled on Launchpad - it is,
> after all no less secure than this, IIUC.
I've pushed it into a separate branch for the moment, so we don't need
to have it in the Debian packaging branch where it doesn't belong.

Cheers,

Jelmer