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

Re: Questions about salsa and Git

Path	csiph.com!feeder.erje.net!1.eu.feeder.erje.net!news.unit0.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Scott Kitterman <debian@kitterman.com>
Newsgroups	linux.debian.maint.python
Subject	Re: Questions about salsa and Git
Date	Tue, 10 Apr 2018 12:50:02 +0200
Message-ID	<vCZ0C-5ui-9@gated-at.bofh.it> (permalink)
References	<vCVT3-366-5@gated-at.bofh.it>
X-Original-To	debian-python@lists.debian.org
X-Mailbox-Line	From debian-python-request@lists.debian.org Tue Apr 10 10:42:18 2018
Old-Return-Path	<debian@kitterman.com>
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, RCVD_IN_DNSWL_NONE=-0.0001, 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=1523356920; 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=da6SPcByQMEq5ngv/YWmF9T/rigwbQVo3ZXEAE8MhQ80YlvOjXejyXGG gfVCLZlJ6hcDQhmp4Cnf4bS2Sq5cAQ==
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=kitterman.com; i=@kitterman.com; q=dns/txt; s=201803r; t=1523356920; 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=kVBItRBM7fBDcqgGdZdmYoxwx+/44oCB6D2Am0/U7sTKQmJiEWNyan5J Sk3AemXuBb1b+L19GUVlKv67yYrd9/jWsD/Ry4UIeIPUgNCFEjv7OmLEdA p3Aus8YFMg9WmB0CfwNvxPfOh97kgj4pQ3RsZ0NgeZZhjhhAXWjTd2mfj7 L27/v4YDWo3pBRWT5CXLp6ufZv0FJVLrXKUwc6s+wb2HakNEyS40eeC8gO A5yJJ79B43F7xzfZOq0Qdbrv3vJxvqsTWSztSGrg/hgROHacWlpapRP4yc gY2q5eH2glq62H45nr1ZvkqZclVpcuGMQMleoAf3++r97KEwWWQLnA==
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Transfer-Encoding	quoted-printable
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/15811
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/9E99CD8F-BDA2-4FB3-9AC6-F26BE5AA89B5@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:43 +0000
X-Original-Message-ID	<9E99CD8F-BDA2-4FB3-9AC6-F26BE5AA89B5@kitterman.com>
X-Original-References	<CAOTq_2WbeVYGbaCHD_5hZ2UOnqyFr=W_4g2+LKwcy1Lc=A7dFg@mail.gmail.com>
Xref	csiph.com linux.debian.maint.python:10411

Show key headers only | View raw


On April 10, 2018 7:24:18 AM UTC, "Guðjón Guðjónsson" <gudjon.i.gudjonsson@gmail.com> 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.
>
>Following the advice on
>https://wiki.debian.org/Python/GitPackaging

Use this instead:
https://wiki.debian.org/Python/GitPackagingPQ

Note: page not updated for the move to Salsa, but generally accurate.

>Does the following advice hold true after the move to salsa?
>
>$ git clone
>git+ssh://git.debian.org/git/python-modules/tools/python-modules.git

No.  That's on alioth.  You can use the web UI on https://salsa.debian.org/ to find the URL for your package.

>I have cloned the eric repository.
>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 == 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 ../srcpkgname_1.0.orig.tar.gz upstream
>?

This is all explained on the wiki page referenced above.

>Regarding the now deprecated get-orig-source target.
>Do you have any example on how to put the mechanism into the watch
>file?

The mechanism is in gbp, not the watch file.  Once again, see the wiki page link.

Scott K

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

Thread

Questions about salsa and Git Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2018-04-10 09:30 +0200
  Re: Questions about salsa and Git Scott Kitterman <debian@kitterman.com> - 2018-04-10 12:50 +0200
    Re: Questions about salsa and Git Simon McVittie <smcv@debian.org> - 2018-04-10 13:20 +0200
      Re: Questions about salsa and Git Brian May <bam@debian.org> - 2018-04-13 01:40 +0200
    Re: Questions about salsa and Git Sandro Tosi <morph@debian.org> - 2018-04-10 17:00 +0200
  Re: Questions about salsa and Git Scott Kitterman <debian@kitterman.com> - 2018-04-10 12:50 +0200

csiph-web