Path: csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: =?UTF-8?B?R3XDsGrDs24gR3XDsGrDs25zc29u?= Newsgroups: linux.debian.maint.python Subject: Git, gbp blues Date: Sun, 25 Aug 2019 21:50:01 +0200 Message-ID: X-Original-To: debian-python X-Mailbox-Line: From debian-python-request@lists.debian.org Sun Aug 25 19:40:17 2019 Old-Return-Path: X-Amavis-Spam-Status: No, score=-7.178 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, FROM_EXCESS_BASE64=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -5.5 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=NzdhhhBIZkl3InYWIEWBbSx5YN0MY/tUSnW2zNn2+BQ=; b=DW7z2w7cUyNxXZWDGN1qC6zQ7RkGdFUHIBUqYJFHAg75LCy7e3S6dqmbejc26bGYN6 gk5zMA4SLLINx0pYHKiUAa4Zw1sI1UBHmDkrriiklVm4X/2g4AnitrcUUixhk7nEHtc9 LY+LAJm2vPBJCCJ0YZIEhYZQ9gEqkyPojPcju4bdF4CWoASM1KBCu+pVeZR6bpK4ecNe 9irW0dKwjUbH00T7ay20Q3Eqv803k0EA82XWQix7/MHY0Lmj3230MA1UIvzu9OH5Xsl8 eRiUlNTZkNZX8+Tg0GweT/vD4gQOstcEbJN0E2VGfvTyPDOuFpF5eRm7QiBxuPewCHuX SGBg== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NzdhhhBIZkl3InYWIEWBbSx5YN0MY/tUSnW2zNn2+BQ=; b=V1Ui2ypthgZZjEyP5nByvCtX3fltqQ6lg0Bu9YUKgWEMubms7J6T6Gpd23keJYN/Ne Tx4xuAKcY5IIFhuQ/msxnO75DIM6W5tY44TlG+fA6Rb45whboRpIREFoZu7tBEWWIo3o A4mXdFom8YGV7bivzOhFPqzZEkQ/4qGLrM5rUSiL6d8QmeD3kK7aakoeTs/9heqIRlU4 ufU6oDbvWpZ7F/beQoceR24aA950y+iY3Xkcb5HI57DD36MD+AyHTBGqeUjt5OprwRKU cBudplzAXw819n4lT45wfnIbf61njqqQYmFvpLMWyEL3FV42zgrbhn/MeVclwq2B7FyR jRfg== X-Gm-Message-State: APjAAAXneOnrv3R7TzR1YaPBA/pkah73iRE3dsgqGQ4QfivCbs6KcLGW 3iV6m8EMaZnjLC0vUTfbtORS54KScO/UzrUCfZ4AYlpp X-Google-SMTP-Source: APXvYqxfIvc+tv21SvfYXL+xR8ni1T7yifuJjskphj64RCWviScxQKDnrJA1JF21M7v3FbtoCYkTEE8qBASagn4RzHo= X-Received: by 2002:a5d:964a:: with SMTP id d10mr19177767ios.301.1566762002289; Sun, 25 Aug 2019 12:40:02 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Mailing-List: archive/latest/17178 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/CAOTq_2VfyvZ44BpKcG10pVgu6UETGAK8yAG38ojABQOFkjKv0w@mail.gmail.com Approved: robomod@news.nic.it Lines: 34 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Sun, 25 Aug 2019 21:40:16 +0200 X-Original-Message-ID: Xref: csiph.com linux.debian.maint.python:11666 Hi list I'm sorry to say but I am no friend of git for Debian packaging but I am a big wannabe. This page has been very helpful: https://wiki.debian.org/Python/GitPackaging It says $ gbp pq import which has more or less solved my problems when trying to upgrade a package. Isn't this an error. Shouldn't it be git checkout? $ gbp checkout debian/master $ gbp import-orig --pristine-tar --uscan .... rebase and export. But I still find working with patch queues difficult especially with new upstream where the old patches don't apply correctly. I tried to do $ gbp pq import but it fails because one of the patches doesn't apply. So I fixed the patches in the old way using quilt push -f quilt edit quilt refresh And after having fixed all the patches I could do $gbp pq import $gbp pq export and the diff seems ok. Is this the correct procedure? Regards Gudjon