Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Brian May Newsgroups: linux.debian.maint.python Subject: Re: gbp pq conversion Date: Sun, 02 Jul 2017 13:00:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Sun Jul 2 10:54:34 2017 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.979 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no X-Policyd-Weight: DYN_NJABL=SKIP(0) NOT_IN_SBL_XBL_SPAMHAUS=-1.5 BL_NJABL=SKIP(-1.5) CL_IP_EQ_HELO_IP=-2 (check from: .microcomaustralia. - helo: .mail-pg0-x230.google. - helo-domain: .google.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microcomaustralia.com.au; s=google; h=sender:from:to:subject:in-reply-to:organization:references:date :message-id:mime-version; bh=uIGVWhnkrBVyJ5lnuNHiyhlat3NRgFiUT3n0rYHxNb4=; b=BEvx0dHILS2sXBufgToHreP0aXAZOb+GrN4lq6pYT+NOpUnU9ttbTvpoMwEEf8azsA FYfCVFpI2ml9HuPXItHtEYpgxnmSd7Hl4KbJzAGDrivmpj7/gj4aNBLlvmhz+pPc6Imj P8D5B2xsoTcdjR5THzOAjk3shSj8ZH7csmDJU= X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:in-reply-to:organization :references:date:message-id:mime-version; bh=uIGVWhnkrBVyJ5lnuNHiyhlat3NRgFiUT3n0rYHxNb4=; b=cgl44AzWeH4HEmEI6L7K78yASvxNimyL4Nju7UpWr5O410SOZU9VU8M2808gU4jcMH kK9xq2ISihGtxexmrDj+jiVa80LOAtMy5ECu84iQBP4Tg5COKPVlh2oNggzfgXPfz5pj MOoMm47GLgiTTX/iFKALnUCPtG7xzVaZ3vmwkMtiKLC4AhVWDbwMRtDaloCbDESdIqsC lfChDqMd1aOS/ivv0dNO+TJcp8BSwnSU1UOsgsbU6VYbDMIL4RcPRyUy65rPj/29ZhtJ N60BK1j1BmQrssbmHcUKLXy4T+WgAPdiR9A/QxtWg2QxFoQbcc6uNZoZF9DSlZFfGdcr zUZA== X-Gm-Message-State: AIVw111yEK6NLpdg1xBrKfrMeJDpsCzkxGSAHY6gWKFuVbIZsJZOAQ60 VVkUX0tUqQIEsRgOdbfGrQ== X-Received: by 10.99.63.206 with SMTP id m197mr4801968pga.170.1498992854850; Sun, 02 Jul 2017 03:54:14 -0700 (PDT) Sender: robomod@news.nic.it Organization: Debian MIME-Version: 1.0 Content-Type: text/plain X-Mailing-List: archive/latest/14981 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/87tw2vm7n4.fsf@prune.linuxpenguins.xyz Approved: robomod@news.nic.it Lines: 35 X-Original-Date: Sun, 02 Jul 2017 20:54:07 +1000 X-Original-Message-ID: <87tw2vm7n4.fsf@prune.linuxpenguins.xyz> X-Original-References: <8737aopiyy.fsf@prune.linuxpenguins.xyz> X-Original-Sender: Brian May Xref: csiph.com linux.debian.maint.python:9602 The one mistake I seem to often make with gbp pq is import the new sources and then discover I forgot to one "gbp pq import". The "gbp pq import" needs to happen first (if not already done), before importing new sources. Otherwise "gbp pq rebase" and "gbp pq export" can end up deleting all patches. The solution I have found is 1. Create a temporary branch at the current commit git branch tmp 2. Take the debian/master branch to the previous "good" commit: git reset --hard version origin/debian/master change the origin/debian/master as appropriate. 3. Import the patch queue (possibly might need to delete any existing patches branch first): gbp pq import 4. Go back to the latest version: git reset --hard tmp git branch -d tmp Note that "gbp pq import" must be done in the correct branch, as the name of the patch branch is based on the current branch. Also note that the "gbp pq import" must be done on patches unapplied format, so don't go too far back in the history. -- Brian May