On Tue, 15 May 2007 18:00:22 +0200 Guido Guenther <[EMAIL PROTECTED]> wrote:
> Hi, > On Tue, May 15, 2007 at 02:58:37PM +0200, picca wrote: > > I am using git-buildpackage to deal with the scigraphica package. > > > > My problem is that during the import-orig of the new upstream > > version (2.1.0) > > > > The process stop du to a conflic between the > > git pull upstream . > So the upstream version ended up correctly on the upstream branch and > it's git-import-orig is pulling to master? Yes the upstream is correct, and yes it is git-import-orig which pull to master > > > I had to resolve the conflic before I can commit the merge. > That's expected and o.k., I guess. Yes > > > but once the commit is done the debian directory is not up-to-date > > like with uupdate. > The debian directory shouldn't be touched when pulling from upstream > or does upstream contain a debian/ dir? You're only missing the > changelog update? Yes and I think the patch of dpatch > > > Is their a way to deal with this problem. > > A special option saying ok now I have merged master with upstream > > now do the debian update process. > No there isn't at the moment, it doesn't make much sense I think > since: dch -v version-number > does the same, or am I missing something? 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 ? Cheers Frederic -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
