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

Questions about salsa and Git

Path	csiph.com!feeder.erje.net!1.eu.feeder.erje.net!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com>
Newsgroups	linux.debian.maint.python
Subject	Questions about salsa and Git
Date	Tue, 10 Apr 2018 09:30:01 +0200
Message-ID	<vCVT3-366-5@gated-at.bofh.it> (permalink)
X-Original-To	debian-python <debian-python@lists.debian.org>
X-Mailbox-Line	From debian-python-request@lists.debian.org Tue Apr 10 07:24:38 2018
Old-Return-Path	<gudjon.i.gudjonsson@gmail.com>
X-Amavis-Spam-Status	No, score=-1.719 tagged_above=-10000 required=5.3 tests=[AC_DIV_BONANZA=0.001, BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, EMPTY_BODY=3, FOURLA=0.1, FREEMAIL_FROM=0.001, FROM_EXCESS_BASE64=0.979, HTML_MESSAGE=2, LDO_WHITELIST=-5, RCVD_IN_DNSWL_LOW=-0.7] autolearn=no autolearn_force=no
X-Policyd-Weight	using cached result; rate: -7
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=IV4ZBQQk6ZRdcRGjRWzdQHK/+huMDt2R7EQ8C6qdX7c=; b=tmOyTS6gfS1Jg0AFLi1iGMjzOlSPfeAVUopzGeLFVbv9aWzyVqEz0IZVh+3+q/Q71C xWoDH9JmE6uSG/WhrlN63kOKVOI5GuMaYkWo2BCCA9IpGC3yiWt3MD2lpyU2peN5iFen 0LqkQOq413YbJFekFmjWembt8DoHx2EhW/Zp/FXtg818NfgRS4WaqtjTL0FWr8wVfGdP +J4HdSuRUxwTUZXWVJZYYV/v2jkTwr9S6mnsxkrGQ16NRJGDEzv73G51tUqbJH+RjNaG V5Sq9WhjyiIL+HB4zRV7HHeT2MzF0FnClvJcPq4JVbhUemLyT+s5AF8weL6EJDjFQUss E3fw==
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=IV4ZBQQk6ZRdcRGjRWzdQHK/+huMDt2R7EQ8C6qdX7c=; b=UZQ5JliSuTwFeeLH7PrR0m6rOrk+0M24GZtLOHtnudeIWOWyKe0OOqWaQF5vzaPQ9V xX4J6xMoj7tJHVYqGS7v8pBnsnTLcr85/DSLn4OOmYFxWnNB/36gpu3fNzQj5++Z3UwX gIyv06vuAuJotLmTraogece8sEFEtBQghwZAPOIOBQEtFVzcixM6XFcuk2pceCRTaRqv W+IBeXmYAbA4IwsXYCeVauYOZLCmoGWtgQd20+ZnSubBHaZCINATBs8RJ4nASukLKNZ6 QDg1TBI1FeTSvGolJ8tPCeRf4NysdIzjA4vzltWYVxpIA2OfKHMLE/dq7ih5GzpnW9rT AmBg==
X-Gm-Message-State	ALQs6tChB+okRkcb+cs1rrWT/Ty922LEAdswoc+l7ip7gFCukyg/nczK EQtViLcpEZgO2BzoekIC2fuGnaG6cyNcZcREaJuNlw==
X-Google-SMTP-Source	AIpwx4/6dWec+9NMZ/mePkKg1kWjtN07zR9y2YzZ/kYRB4+fncUDNOPuSnshAs9FfBaHew4GSVMb6U57oA1kTvJEVPA=
X-Received	by 10.107.36.12 with SMTP id k12mr1833984iok.269.1523345059007; Tue, 10 Apr 2018 00:24:19 -0700 (PDT)
MIME-Version	1.0
Content-Type	multipart/alternative; boundary="001a11403ab21cd30d0569796982"
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/15809
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/CAOTq_2WbeVYGbaCHD_5hZ2UOnqyFr=W_4g2+LKwcy1Lc=A7dFg@mail.gmail.com
Approved	robomod@news.nic.it
Lines	76
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Tue, 10 Apr 2018 09:24:18 +0200
X-Original-Message-ID	<CAOTq_2WbeVYGbaCHD_5hZ2UOnqyFr=W_4g2+LKwcy1Lc=A7dFg@mail.gmail.com>
Xref	csiph.com linux.debian.maint.python:10409

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

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

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


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
?

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

Regards
Gudjon

Back to linux.debian.maint.python | Previous | Next — Next 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