Path: csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod From: Ondrej Novy Newsgroups: linux.debian.maint.python Subject: Re: git-dpm -> gbp conversion (mass-change) Date: Thu, 09 Aug 2018 11:00:01 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Thu Aug 9 08:57:35 2018 Old-Return-Path: X-Amavis-Spam-Status: No, score=-1.977 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, EMPTY_BODY=3, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, HTML_MESSAGE=2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=no autolearn_force=no X-Policyd-Weight: using cached result; rate: -7 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ondrej-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mdHyHyZymqpIn1xI6FklKQPXzQW03J9P7HOmjcHxArM=; b=LVHy+u7D74xy+mD7cdvY0oDbjU7RnSbXShHuxLNToWF+0uKW0/SfBuAbFvcHJZ8kFA nPgjMSl2m69ngaJ8jcPWBg2ZVZ5VIkqGtwKM73GKSzt2NTrXJ0wSi+I95fkw0fTNXsKj xsERYX7N+GuqFfIh9aNYLNhf8YU5Y9V+YjTgvVukQKPPUeRgcuH1G+mHWGtO4XSrxWjd bVyj7bX1566npIZ86lsLs4nznbKER20CNcBK0HTIZ7KWYlc+1TRjdquXeNcN/s5EBSOS QuwkArssE+WP2ip7hHermuaR1H9TQkcPRUYZghJEiTTa5enxIBG4Tj/Jdqp8N2gy+ICX n/dQ== X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mdHyHyZymqpIn1xI6FklKQPXzQW03J9P7HOmjcHxArM=; b=AZRSORksARHcIh8NEIqFBWw8P0X0Z238qv57pY79LOJx9IXSX5gbKNQvQR51SAuPQV ceDwcFI6AI2YYCss2BHSf7a57sdjfcbayuCFNMNtEsTNwnyJVSPkeG4TJUpWyVTRYV1H Jp+4Ak4rssjNvD4yPKL5GbaMVD0n5RO0rOScery870EIsBJBZoyd+issl2GEC9FKlrkk duCKqGwmVl9OYQtOJpvI7RPgLXkRlocD/KrmOt3CQHrWFbUbkHI/K/ibzJrSWu89T0Nl S+QZ4yFVrfQ/1jt5ze83fjw9YwrEpVQuWu1jJ1+5DbQInANiTB7yg/TjaBWD3yXaQxcP r92Q== X-Gm-Message-State: AOUpUlERvcxg60qVRIWA7BI3oT74S3ricNfPJSD4F+jnhezFKc2nICGV iEDc6C8VnPAX+0vitKB1oPusm6VoRfk6ttUjddQ= X-Google-SMTP-Source: AA+uWPwCqW3OmtGoa4QTUd9PMvbyGGG/NEigL7OBYpaO0OMoK1rgT3FX5kjEFutKyFbk0xiknO++XJi9zhecL4sZIOg= X-Received: by 2002:a1f:105e:: with SMTP id g91-v6mr674559vki.21.1533804125731; Thu, 09 Aug 2018 01:42:05 -0700 (PDT) MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="00000000000011c0800572fc9a4c" X-Mailing-List: archive/latest/16199 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/CAOO6c=zwb8fJPxH4=5kuN4gHyLnpKfM31-E=64KhQ6LJ96noMw@mail.gmail.com Approved: robomod@news.nic.it Lines: 83 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Cc: debian-python X-Original-Date: Thu, 9 Aug 2018 10:41:54 +0200 X-Original-Message-ID: X-Original-References: <20180802151614.jlu5w3l3lnhwi3he@werner.olasd.eu> <20180804070542.ehshncjtlx4lsswf@macbookair> <87h8k53x69.fsf@vostro.rath.org> <87eff84qf3.fsf@vostro.rath.org> <4a75664f-b4d6-7eb0-f5fd-1974b20c53be@debian.org> Xref: csiph.com linux.debian.maint.python:10779 --00000000000011c0800572fc9a4c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, =C4=8Dt 9. 8. 2018 v 10:16 odes=C3=ADlatel Thomas Goirand = napsal: > Let's say a patch has been applied upstream. In such case, I just do a > few "quilt push" to check, then I see one is already applied (by running > "patch --dry-run -P1 patch from the series file, and I'm done. In case of using git with the > rebase thing, then I get into useless trouble. > if patch is already applied upstream, git-dpm/git autoremove that patch. What "trouble"? Another case is if upstream moved sources from one directory to another. > In such case, I just edit the patch directly to fix the path. With a git > rebase, you'd probably have to rewrite all the patch by hand. Here > again, that's useless trouble. > ugly (really). > Now, if all goes well, and if the above cases are fixed, them I'm fine > using "gbp pq", but it's not any better than fixing by hand using quilt. > it's much better :) --=20 Best regards Ond=C5=99ej Nov=C3=BD Email: novy@ondrej.org PGP: 3D98 3C52 EB85 980C 46A5 6090 3573 1255 9D1E 064B --00000000000011c0800572fc9a4c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

=C4= =8Dt 9. 8. 2018 v=C2=A010:16 odes=C3=ADlatel Thomas Goirand <zigo@debian.org> napsal:
Let's say a patch has been applied upstream. In su= ch case, I just do a
few "quilt push" to check, then I see one is already applied (by = running
"patch --dry-run -P1 <debian/patches/foo.patch"), then I just = remove the
patch from the series file, and I'm done. In case of using git with the=
rebase thing, then I get into useless trouble.

if patch is already applied upstream, git-dpm/git autoremove that p= atch. What "trouble"?=C2=A0

Another case is if upstream moved sources from one directory to another. In such case, I just edit the patch directly to fix the path. With a git rebase, you'd probably have to rewrite all the patch by hand. Here
again, that's useless trouble.

ugly= (really).
=C2=A0
Now, if all goes well, and if the above cases are fixed, them I'm fine<= br> using "gbp pq", but it's not any better than fixing by hand u= sing quilt.

it's much better :)=C2= =A0

--
<= div dir=3D"ltr">
Best regards
=C2=A0Ond=C5=99ej Nov= =C3=BD
=C2=A0
Email: novy@ondrej.org
PGP:=C2=A03D98 3C52 EB85 980C 46A5 =C2= =A06090 3573 1255 9D1E 064B

--00000000000011c0800572fc9a4c--