Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod From: Piotr =?utf-8?Q?O=C5=BCarowski?= Newsgroups: linux.debian.maint.python Subject: Re: DPMT Policy Date: Wed, 21 Oct 2015 14:10:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Wed Oct 21 12:07:16 2015 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.879 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -6.1 Mail-Followup-To: debian-python@lists.debian.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Operating-System: Debian GNU/Linux (3.16.0-4-amd64) User-Agent: Mutt/1.5.23 (2014-03-12) X-Mailing-List: archive/latest/13046 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20151021120650.GW15907@sar0.p1otr.com Approved: robomod@news.nic.it Lines: 65 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Wed, 21 Oct 2015 14:06:50 +0200 X-Original-Message-ID: <20151021120650.GW15907@sar0.p1otr.com> X-Original-References: <20151019133137.6174ef07@limelight.wooz.org> <20151019212639.GF3846@p1otr.com> <20151020165359.69f44eae@limelight.wooz.org> <20151020213047.GS15907@sar0.p1otr.com> <20151020205251.65c88f04@limelight.wooz.org> Xref: csiph.com linux.debian.maint.python:7734 [Barry Warsaw, 2015-10-21] > What I'm trying to express is the team decision (a couple of debconfs ago) for > pristine-tars rather than releasing from upstream git. I do want to keep the > rationale in the policy doc; it's one sentence and it seems to come up often > enough. Suggestions for better phrasing welcome! Only version to version upstream changes should be kept in the repository - complete upstream git history should be avoided. In order to make it easier to cherry-pick upstream commits as patches, add remote repository (example below). git remote add upstream_repo git://example.com/foo.git git fetch upstream_repo git-dpm checkout-patched git cherry-pick any_upstream_commit git-dpm update-patches > >> +for use with ``pbuilder``, ``sbuild``, etc. or as a binary package directory. > > > >gbp can use sbuild/pbuilder, here's my ~/.gbp.conf: > > > > [buildpackage] > > builder=sbuild > > This is the kind of thing that should go in the wiki. > I simply suggest to: s/, either as a source package for use with ``pbuilder``, ``sbuild``, etc. or as a binary package directory/ (it can be configured to use sbuild, pbuilder, etc.)/ or remove this part completely > >> +Use the following ``git-dpm`` tag formats for the three branches named above. > >> +Put these lines at the *end* of your ``debian/.git-dpm`` file:: > >> + > >> + debianTag="debian/%e%v" > >> + patchedTag="patches/%e%v" > >> + upstreamTag="upstream/%e%u" > > > >I will update `py2dsp --profile dpmt ...` to do that out of the box, but > >even then, it's better to suggest that tool in the wiki only, I guess > > I think so. The tag format (and IMHO the mechanism to ensure it) should go in > policy though. nothing against this paragraph, just wanted to state that wiki will not have to mention it if we have a tool that configures new package the way policy wants. > >I'm wondering about something that bit me recently: `gbp pull` instead > >of `git pull` - should we put that into policy or is wiki warning enough? > > I think wiki is enough. It is possible to operate with just straight `git > pull` because it will still fetch all commits, but when you switch to one of > the other branches, you'll see that its head is out of date, and git will > prompt you to pull in that branch to update it. `gbp pull` is mostly > convenience. gbp buildpackage will fail if you never switched to pristine-tar (and git didn't warn you about new commits). It wasn't obvious to me why it fails when it hit me for the first time. -- Piotr Ożarowski Debian GNU/Linux Developer www.ozarowski.pl www.griffith.cc www.debian.org GPG Fingerprint: 1D2F A898 58DA AF62 1786 2DF7 AEF6 F1A2 A745 7645