Path: csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod From: Scott Kitterman Newsgroups: linux.debian.maint.python Subject: Re: Questions about salsa and Git Date: Tue, 10 Apr 2018 12:50:01 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Tue Apr 10 10:42:06 2018 Old-Return-Path: X-Amavis-Spam-Status: No, score=-5.79 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, FOURLA=0.1, GMAIL=1, LDO_WHITELIST=-5, T_DKIM_INVALID=0.01] autolearn=no autolearn_force=no X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .kitterman. - helo: .mailout03.controlledmail. - helo-domain: .controlledmail.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5 Dkim-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=kitterman.com; i=@kitterman.com; q=dns/txt; s=201803e; t=1523356907; h=date : in-reply-to : references : mime-version : content-type : content-transfer-encoding : subject : to : from : message-id : date : subject : from; bh=lV3QyLMSt6DxwwXy/p3L1G3tqkCE19LpUk3sirWfWuE=; b=uQbTHOXNaumWKxZm+7qkSKz0eOxNszZ303lq18ERoUwQrW9SDGRGaoVA rx3wd/WYR6+4qRXv25wsRt3LaqK4CQ== Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kitterman.com; i=@kitterman.com; q=dns/txt; s=201803r; t=1523356907; h=date : in-reply-to : references : mime-version : content-type : content-transfer-encoding : subject : to : from : message-id : date : subject : from; bh=lV3QyLMSt6DxwwXy/p3L1G3tqkCE19LpUk3sirWfWuE=; b=twS0cwLzLO/RvrygaSHHjkEWEsuuiDU4To/4yA/0JCHJWmIMKiPTwCY0 sAwXQ4zcRTiBSI0TqlUeyvEPwgzxhlgjKoxSOp0NpTH+wN6XxSSDGsUppe TqruQGTEQTqikQtWKPB2s6qvlHtyfiLQJ/n7fHE/3h750/zU8Lkqm0FZji uN0p1aGpQXxwK8RF8EljSqr/WF9fljbk5n2Jo6omcmlJqMr01u5ICK93k6 DnmG7gFxCD9Cbb49S2DVksyHsqCQ84iPN9WxF2a4xg8r03oC60Vh3cyRXy MlJimEXt/p6tuZIoTNINLsh90fM44T0PZSgBOZPC/w2FCXWsLOraaw== MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Mailing-List: archive/latest/15810 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/AA326483-7C78-42F6-8C58-58C30C3C43C5@kitterman.com Approved: robomod@news.nic.it Lines: 62 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Tue, 10 Apr 2018 10:41:41 +0000 X-Original-Message-ID: X-Original-References: Xref: csiph.com linux.debian.maint.python:10410 On April 10, 2018 7:24:18 AM UTC, "Gu=C3=B0j=C3=B3n Gu=C3=B0j=C3=B3nsson" = wrote: >Hi list > >I have to admit that I have never become comfortable with the Debian >Git >workflow >but I know I have to learn to use it=2E > >Following the advice on >https://wiki=2Edebian=2Eorg/Python/GitPackaging Use this instead: https://wiki=2Edebian=2Eorg/Python/GitPackagingPQ Note: page not updated for the move to Salsa, but generally accurate=2E >Does the following advice hold true after the move to salsa? > >$ git clone >git+ssh://git=2Edebian=2Eorg/git/python-modules/tools/python-modules=2Egi= t No=2E That's on alioth=2E You can use the web UI on https://salsa=2Edebi= an=2Eorg/ to find the URL for your package=2E >I have cloned the eric repository=2E >git branch -a >* debian/master > remotes/origin/HEAD -> origin/debian/master > remotes/origin/debian/master > remotes/origin/lenny > remotes/origin/pristine-tar > remotes/origin/svn > remotes/origin/upstream > > >Is debian/master =3D=3D master? >Shall I checkout and pull the pristine-tar and upstream >git checkout remotes/origin/upstream -b upstream >git pull >git checkout remotes/origin/pristine-tar -b upstream >git pull > >To update the package, shall I copy the new upstream over the upstream >branch, >commit and then do >$ pristine-tar commit =2E=2E/srcpkgname_1=2E0=2Eorig=2Etar=2Egz upstream >? This is all explained on the wiki page referenced above=2E >Regarding the now deprecated get-orig-source target=2E >Do you have any example on how to put the mechanism into the watch >file? The mechanism is in gbp, not the watch file=2E Once again, see the wiki p= age link=2E Scott K