On Wed, May 16, 2007 at 08:29:17AM +0200, picca wrote: > I am not very clear, so my view of the build process is if a merge is > pending no way to build the package with a message saying, ok it's time > for you to solve the conflict. Then once the conflic have been solved, > if the user want to build the package it check that the changelog is > the one of the current upstream/version, if not it run "dch" and print > a message saying "please do not forget to modify the chagelog" > > Is clearer ? I already implemented what we discussed before. The package is unbuildable via git-buildpackage anyway, since the git-status is not clean and the git-import-orig now prints what to do. Cheers, -- Guido
-- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

