Your message dated Wed, 15 Nov 2017 15:42:39 +0100
with message-id <20171115144239.575hpq2z6osvd...@bogon.m.sigxcpu.org>
and subject line Re: Bug#571075: [PATCH] docs/manpages/git-dch.sgml: Clarify
that branch `master` is used by default.
has caused the Debian Bug report #571075,
regarding [PATCH] docs/manpages/git-dch.sgml: Clarify that branch `master` is
used by default.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
571075: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571075
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Subject: [PATCH] docs/manpages/git-dch.sgml: Clarify that branch `master` is
used by default.
Package: git-buildpackage
Version: 0.4.65
Severity: normal
Tags: patch
Dear Debian folks,
please find the patch attached.
Thanks,
Paul
From 2d5d91570aff0d64b4b0c7e809c6ad08b7b78133 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pm.deb...@googlemail.com>
Date: Tue, 23 Feb 2010 10:07:29 +0100
Subject: [PATCH] docs/manpages/git-dch.sgml: Clarify that branch `master` is used by default.
$ git branch
* debian
$ git dch
You are not on branch 'master' but on 'debian'
Use --debian-branch to set the branch to pick changes from
Signed-off-by: Paul Menzel <pm.deb...@googlemail.com>
---
docs/manpages/git-dch.sgml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index c45b5ac..cf7bdf4 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -42,11 +42,11 @@
<para>
&git-dch; reads git commit messages and generates the Debian changelog from
it. If no arguments are given &git-dch; starts from the last tagged Debian
- package version up to the current tip of the current branch. 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>
+ 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>
<para>If <option>--auto</option> is given &git-dch; tries to guess the
last &git; commit documented in the changelog - this only works in snapshot
mode. Otherwise <option>--since</option> can be used to tell &git-dch;
--
1.7.0
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
--- End Message ---
--- Begin Message ---
Hi,
On Thu, Mar 04, 2010 at 07:16:58PM +0100, Guido Günther wrote:
> On Tue, Mar 02, 2010 at 02:18:54PM +0100, Paul Menzel wrote:
> > 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?
> No, since it's not quiet right.
>
> package version up to the current tip of the current branch. If the
> current branch is not the debian-branch (default is master) it will
> warnon you and bail out.
> 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>
Closing that one since the documentation is IMHO correct.
Chees,
-- Guido
--- End Message ---
