RFS: audacious/3.6.2-2~bpo8+1 and audacious-plugins/3.6.2-2~bpo8+1
Nicholas D Steeves
nsteeves at gmail.com
Mon May 2 00:06:45 UTC 2016
On 29 April 2016 at 22:42, Mattia Rizzolo <mattia at debian.org> wrote:
> On Fri, Apr 29, 2016 at 07:55:29PM -0400, Nicholas D Steeves wrote:
>> But you said you preferred it to be pushed with just a tag!
> yes, but not in master!
> A tag is always wanted in any case, with "just a tag" I was meaning a
> tag that is not in any branch, try having a look at some package of mine
> with a backport (like pbuilder, diffoscope, s3fs-fuse,...), you'll see
> that there is a bpo tag, but the commit referenced by that tag is not in
> any branch.
> But I can easily see how this can be confusing/hard, so a
> jessie-backports tag is just a very good way to deal with it! :)
>> So you wanted me to detach from the master branch with: git checkout
>> master^ before making changes?
> git checkout master^ would bring you to whatever is right before master
> (what's so special about the second-last commit on master?)
> You should make sure that you are on the commit describing the uploaded
> package, which not always is what is pointed by master.
> So probably here I'd say that you should do `git checkout debian/3.7.2-1`
> (or whatever version you are backporting) before doing anything
>> And when the next version of the package hits stable I'd git checkout
>> master && git checkout master^ ?
> erm? Can't understand what you mean here (1/ "hits stable" is very much
> something not real 2/ `git checkout master && git checkout master^`
> looks very fishy, what would do that?)
This is question I've been trying to answer: How do you detach from
HEAD? I read a possibly obsolete article that said to add the caret
symbol at the end of the branch do do this. Is this not the case? Is
it rather "git checkout master^0"? And in this case, isn't it more
appropriate to to do "git checkout --detach debian/3.7.2-1".
As for "hits stable" I'm sorry, that was a thoughtless and automatic
typo. I meant "hits testing", as in, when a package without RC bugs
automatically migrates. So in this case, to prepare for a
not-in-a-branch commit would I "git checkout --detach
>> What tag would you like me to use for the backport?
> the tag should be 'debian/$version', so like 'debian/3.7.2-1_bpo8+1'.
> `gbp buildpackage` would create it right.
Oh, thank you, I love helper scripts. For extra safety, is the
following appropriate?: gbp buildpackage --git-debian-branch=''
I'm going to write a "contributing backports with git" article for the
wiki once I get this figured out, in the hopes that it will prevent
future situations like this one from emerging.
More information about the pkg-multimedia-maintainers