On Mon, Aug 20, 2018 at 10:23:50AM +0200, Christoph Berg wrote: > Re: Marc Haber 2018-08-19 <20180819185517.gl5...@torres.zugschlus.de> > > I'm trying to avoid > > > > Case 1: Somebody working on the branch, committing things and generating > > new changelog entries for a version (x-y) that is already in the archive and > > should therefore not be changed in the vcs > > "dch" will take care of automatically incrementing the version number > if the distribution is not UNRELEASED.
With a usual workflow, when the changelog is only adapted after a few commits have accumulated (with dch --since), that will mean that the changelog indicates that the git repo contains the released version. On a second thought, I can probably live with that after adopting the view that debian/changelog is only relevant in an uploaded package. > > Case 2: Somebody working on the branch with a new version (x-y+1), > > deploying test versions of the package that will not be overwritten by > > later versions of the package (with the same version number) from the > > archive, with the side effect that different but identically numbered > > versions of the packages fly around. > > I think the proper fix if that behavior is desired is > > 1) tell dch to produce a .0 (I'd prefer ~unrel) version number (and > have "dch -r" remove it) and so I'd generate a changelog entry for x-y+1~unrel after uploading x-y? that's indeed nicer than a .0 version. > 2) only generate this changelog entry with the first change, i.e. > leave git unmodified until the first change happens. That would mean that all people committing would have to remember that. I don't think that's realistic in a team maintained package. > I don't think we can easily tell this case from various other edge > cases apart in vcswatch. If there's a new changelog entry, or commits > since the last tag, it needs to raise "NEW" or "UNREL". Right. Thanks for your explanations, they have really been enlightening to me. Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421
