[Pkg-php-commits] [php/debian-sid] update changelog for 5.3.1-1 release

[sean finney]

On Tue, Mar 09, 2010 at 10:02:52AM -0600, Raphael Geissert wrote:
> On 9 March 2010 08:26, Ondřej Surý <ondrej at sury.org> wrote:
> > ---
> >  debian/changelog |    8 ++++++--
> >  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> Btw, _I_ would prefer if the changelog is not generated until the
> package is actually going to be uploaded. It reduces the number of
> commits and noise.

+1.  if there's a problem with not having the changelog represent the
version being built i wouldn't be against the idea of committing an empty
changelog after upload (so that packages built after that point don't
pretend to be the previous version), but otherwise it's nice to be able to
generate the changelog in one go with git-dch and then just do some editing
on the output.  and during the time between the git logs are a lot cleaner
and more readable.

And while we're nitpicking, I've been meaning to bring this up for a
while now...

How about we make it a practice to *not* refresh patches unless it's fixing
actual breakage or removing fuzz (i.e. not just fixing offsets)?

I've done it both ways myself in the past but after the last time i had to
do a merge involving ./debian/patches i had to deal with the pain of
resolving a number of conflicts that could have been much smaller in
number had it not been for the various refreshes that we've done.  it's
a bit of a brainfuck to have to resolve merge conflicts in a patch.

if we have agreement on either/both of these i'll make sure that the
practices are documented in the GitUsage page.


	sean
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-php-commits/attachments/20100309/a57edf9b/attachment.pgp>