Dear Guido,
Am Dienstag, den 02.03.2010, 07:39 +0100 schrieb Guido Günther: > On Mon, Mar 01, 2010 at 12:22:37PM +0100, Paul Menzel wrote: > > Am Donnerstag, den 25.02.2010, 21:06 +0100 schrieb Guido Günther: > > > On Tue, Feb 23, 2010 at 10:29:47AM +0100, Paul Menzel wrote: > > > > + package version up to the current tip of branch > > > > + <replaceable>master</replaceable>. If the distribution of the > > > > topmost > > > > + section in <filename>debian/changelog</filename> is > > > > + <emphasis>UNRELEASED</emphasis> the changelog entries will be > > > > inserted into > > > > + this section. Otherwise a new section will be created.</para> > > > That's not completely true. HEAD is used by default, that _might_ be > > > master but can be any otehr branch you're on as well. > > > > I am confused. > > > > $ grep -C1 "You are not on branch" git-dch > > if options.debian_branch != branch: > > print >>sys.stderr, "You are not on branch '%s' but on > > '%s'" % (options.debian_branch, branch) > > raise GbpError, "Use --debian-branch to set the branch > > to pick changes from" > > > > $ grep -B1 debian-branch gbp.conf > > # the default branch for the debian patch: > > #debian-branch = master > > > > Does not it use master by default then? Where does > > `options.debian_branch` come from? > It looks at the _changes_ from --since up to HEAD (tip of the current > branch). However it makes sure that you're on "debian-branch" which is > indeed 'master' by default. If you're on a different branch it issues a > warning and aborts, trying to make sure you don't record changes from a > different branch. If `master` is indeed the default, can you apply the patch? Sorry, if I got this wrong. Thanks, Paul
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
