Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #8731

Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was: PAPT Git)

Show all headers | View raw

On 08/10/2016 09:21 AM, Sandro Tosi wrote:
> On Tue, Aug 9, 2016 at 11:50 PM, W. Martin Borgert <debacle@debian.org> wrote:
>> On 2016-08-09 23:28, Daniel Stender wrote:
>>> On this occasion ... let it be me to start the discussion: let's get into Git
>>> also for Python Apps soon.
>>
>> A common VCS for both DPMT and PAPT would be nice, indeed.
> 
> should we try and use plain git-buildpackage instead of git-dpm?

Piotr avoided the discussion during Debconf 16. IMO for good, as it
would have probably taken a full session.

I wrote a draft about my thought about it. Let me past it here.

The biggest defect of git-dpm, to me, is that it is often very painful
to merge a new upstream release in the packaging branch. Instead of
accepting the merge, and resolving conflicts later on, git-dpm goes into
the rebase conflict mode of Git, and it's often not obvious what to do
there. Messing-up everything, and restart from scratch (and then iterate
until done properly) isn't uncommon. Sometimes, all of this time is
spent just for a patch that needs to be removed removed.

With git-dpm, many operations aren't obvious, and it seems there's not
even an answer for stuff like this:
https://bugs.debian.org/810580
https://bugs.debian.org/801667
https://bugs.debian.org/801666

which stayed opened with no reply for months.

Sometimes, things are just very annoying:
https://bugs.debian.org/763569
https://bugs.debian.org/813302
https://bugs.debian.org/768382
https://bugs.debian.org/801649

It is also annoying that git-dpm doesn't produce a clean git history. It
ends up this way:

commit 241398abe0c476f39f0b4d62fb5227e4d0a52778
Merge: c72e5ea 880b748
Author: Thomas Goirand <zigo@debian.org>
Date:   Tue Aug 2 08:40:37 2016 +0000

    merge patched into master

commit 880b74889bbba237fe1bb17d992e1cbbb462be6b
Author: Thomas Goirand <zigo@debian.org>
Date:   Tue Aug 2 08:39:49 2016 +0000

    django-1.10-fix_runtests_lack_of_TEMPLATES

when really, this should be a single commit, not a merge operation. This
also doesn't include the debian/changelog comments, which also should be
in the same commit.

Even more: the generated patch headers aren't compliant with the format
1.0 as defined in the DEP. Meaning that we have to rewrite them. But
worse: git-dpm rewrites the headers loosing precious information like
the Origin field or bug numbers.

git-dpm also fails to tag upstream/foo automatically when importing a
new version. I've been told to use "git-dpm tag", but that's not
obvious. My own experience managing debian/patches quilt patches
manually or through gbp pq is actually much much nicer.

Plus it appears git-dpm is unmaintained and even sometimes buggy
(according to what I heard from others in Debconf: I didn't experienced
crashes myself). The non-mandatory use of "gbp pq" is nicer approach:
those who prefer manual quilt handling can do it.

As I only heard complains about git-dpm, maybe someone would like to
express his joy using it, and explain why they think it's a nice tool.
But is there such person? It seems git-dpm only brings frustration.

Cheers,

Thomas Goirand (zigo)

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

pypi2deb 1.20160809 and --profile dpmt Piotr Ożarowski <piotr@debian.org> - 2016-08-09 21:30 +0200
  Re: pypi2deb 1.20160809 and --profile dpmt Daniel Stender <stender@debian.org> - 2016-08-10 00:00 +0200
    Re: pypi2deb 1.20160809 and --profile dpmt Barry Warsaw <barry@debian.org> - 2016-08-10 00:10 +0200
    PAPT Git (was: pypi2deb 1.20160809 and --profile dpmt) "W. Martin Borgert" <debacle@debian.org> - 2016-08-10 01:00 +0200
      Re: PAPT Git (was: pypi2deb 1.20160809 and --profile dpmt) Sandro Tosi <morph@debian.org> - 2016-08-10 09:30 +0200
        Re: PAPT Git Piotr Ożarowski <piotr@debian.org> - 2016-08-10 09:40 +0200
        Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) Thomas Goirand <zigo@debian.org> - 2016-08-10 10:20 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) "W. Martin Borgert" <debacle@debian.org> - 2016-08-10 11:00 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was: PAPT Git) Brian May <bam@debian.org> - 2016-08-10 12:50 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) Barry Warsaw <barry@debian.org> - 2016-08-10 16:20 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Nikolaus Rath <Nikolaus@rath.org> - 2016-08-10 21:00 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-10 22:50 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Simon McVittie <smcv@debian.org> - 2016-08-11 01:20 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-11 15:30 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Simon McVittie <smcv@debian.org> - 2016-08-11 18:10 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Thomas Goirand <zigo@debian.org> - 2016-08-15 23:50 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-16 00:00 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Raphael Hertzog <hertzog@debian.org> - 2016-08-10 23:00 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Brian May <bam@debian.org> - 2016-08-12 12:40 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Sergio Durigan Junior <sergiodj@sergiodj.net> - 2016-08-13 00:00 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-13 00:40 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Sergio Durigan Junior <sergiodj@sergiodj.net> - 2016-08-16 22:40 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT IOhannes m zmölnig (Debian/GNU)  <umlaeute@debian.org> - 2016-08-31 23:50 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-09-02 21:20 +0200
  Re: pypi2deb 1.20160809 and --profile dpmt IOhannes m zmölnig (Debian/GNU)  <umlaeute@debian.org> - 2016-08-31 23:50 +0200

csiph-web