[Pkg-gnupg-maint] GPA maintenance

Daniel Kahn Gillmor dkg at fifthhorseman.net
Tue Sep 2 05:19:26 UTC 2014


On 09/01/2014 11:16 PM, Eric Dorland wrote:
> * Daniel Kahn Gillmor (dkg at fifthhorseman.net) wrote:
> [snip] 
>> PS i think it might make for a cleaner collaborative process in the
>> future to avoid pushing changes to debian/changelog until we're ready to
>> release -- then we can use git-dch to assemble the full debian/changelog
>> before releasing the debian package.  I'm not suggesting that we revise
>> the existing work, but that maybe that will be smoother going forward to
>> avoid debian/changelog edit collisions.  what do you think?
> 
> I've so far been firmly in the camp of using debcommit and having the
> changelog get carried along with the change. How big a problem are
> changelog conflicts?

I don't actually feel that strongly about it.  Debcommit's approach of
filtering the changelog by author probably helps avoid the conflicts,
since each author's items end up in a different place in the file.

I'm happy to go with the debcommit workflow (that is, updating
debian/changelog with each commit) as long as we're willing to
reevaluate it later if anyone presents any serious problems with it.

	--dkg

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnupg-maint/attachments/20140902/5b88e457/attachment-0001.sig>


More information about the Pkg-gnupg-maint mailing list