On Wed, 16 May 2007 00:00:57 +0200
Guido Guenther <[EMAIL PROTECTED]> wrote:

> On Tue, May 15, 2007 at 06:54:20PM +0200, picca wrote:
> > Yes dch -v version-number seems to do the trick for the change log.
> > So it would be nice to print something after git-import-orig stop
> > du to the merge comflic
> > 
> > "please fix the conflig" then "dch -v version-number"
> > 
> > What do you think about this ?
> Sounds good, I'll add this to one of the next releases.
> Thanks,

I was thinking about this last night (for me ;). It would be nice to
have a special option in git-buildpackage to do only the dch -v
version-number as during the origin import we already give the version
number. Or it could be less error prone if the git-buildpackage during
the build process checked that the changelog is already the one of the
last debian version and propose to update the changelog taking the
version number from the upstream.

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 ?

Have a good day.

regards, frederic.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to