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

[Debian PAPT] Question about salsa repo and packaging

Path	csiph.com!news.mixmin.net!news.unit0.net!newsfeed.CARNet.hr!news.spin.it!bofh.it!news.nic.it!robomod
From	Hilmar Preuße <hille42@web.de>
Newsgroups	linux.debian.maint.python
Subject	[Debian PAPT] Question about salsa repo and packaging
Date	Sat, 15 Sep 2018 17:50:01 +0200
Message-ID	<wykZz-6CG-1@gated-at.bofh.it> (permalink)
X-Mailbox-Line	From debian-python-request@lists.debian.org Sat Sep 15 15:40:55 2018
Old-Return-Path	<hille42@web.de>
X-Amavis-Spam-Status	No, score=-7.329 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_LOW=-0.7] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -7
Organization	Hilmar Preuße Inc.
User-Agent	Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Language	en-US
Content-Transfer-Encoding	8bit
X-Provags-ID	V03:K1:YpQMR+8+SzDC/2zmHOy/R8eQlaXV307mNv3lnXu1YFQzZ3H9vny iV4cv8bbdof3sOvo8rhrakXLZ0vuobMZLeifB4782CmMGAj3oFwhtpNon8m6F4jjWv4rZr7 GFVf2mZkueQThQtqVQbljsSKAoIUA/GvrXO5aNt1rFXC8U8N2Q2nLmairQt3YFE6fu6DbIR R0GdlHxtJYWukG16DxitQ==
X-Ui-Out-Filterresults	notjunk:1;V01:K0:HBOa78TGors=:or0EwFnzKLKaYXg27T7J3p iLrtdfNb/xGb4tBvC5Oe1ndXkrBjpwXhWHDhDJTp3Om4v256/73E5V0rUh3v111+8Qv4O3Kyy MevOOHzU5GG23vkWjqm/9fSo0yNTO+5z9HF9yfF5goGNFsykSSETHBOlKT+/UICx8HcxeE82i aSfoctee3f63e8m+E4C+h+TFaxYBdS3zgrErX1Me1H2M+nql1JqV/AnmmKCfS97Q1v1/CvUsM PyupSOlB1mkrQ68PqkeF7Hxk0lcDSUY0zxt4qiR7DuVb0xppiHwdX4/K4CKa5YrgJ5fY7ESkL G5hJtIBJNPV9JIgBQkVjBVXinfxJ5By/JhQF5GwOh9qKyv4OG9H1+0wpvxsR9kOg9kiMEHi1I KN+lv8g3/T0Qb267gVgPQCWlWa2Hdelgp/AC7BUH+PU3H4Sv0FquANi//lmMrIjphFROQivAi OpE80KBtEh1u90tSGXvSdBP0n5B07IO2sWlKedZDaGa2AdeoHFDgyie0bpr8rklPebwDNcKiT Ul4IYkjq4A6+Uoei0+ZcjjdmscQzyX7napuk0YycqURpKq0q8nTEz+wTLvsB6sSiKcRgaICWC NJUHK1xfONVi4I7XFGTKl3kzVY2gs7N2HxojiIMM0ttgXeG8YiRJj6jwM3q6kp35F5Xdt6z6x wyt58yddCjUePgeIQH3zsm6uTH6hx9i2kwYqLtLA5tQrV7AdVgxAivJqC2GaDqY//NRInPfAt YyNEFLGYjKpUNI7jIoJWTU1HJ23L8R+mRnC02yx383ggZTnZpbz34uN3K1tsauMgV4KGucBVb MCQloMSjferssBry1sn+SwVlbeNW3yfM2Ar8Y1akk85NTWxzmw=
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/16327
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/ee655afb-b058-afb7-7622-b4e57111a23b@web.de
Approved	robomod@news.nic.it
Lines	51
Sender	robomod@news.nic.it
X-Original-Date	Sat, 15 Sep 2018 17:40:35 +0200
X-Original-Message-ID	<ee655afb-b058-afb7-7622-b4e57111a23b@web.de>
Xref	csiph.com linux.debian.maint.python:10900

Show key headers only | View raw

Hi,

I'm maintaining the package rubber in the PAPT. I have a few question:

1. I'd like to revert some changes to the salsa repo for my package, as
these changes were never uploaded to Debian and are not superseded by
new upstream package. Is it OK to do a "git reset --hard xxxx" to make
them disappear in my repository?

2. My repo contains a stale branch called "svn". It was created during
the git -> salsa migration. AFAICT this branch contains obsolete
versions of some files. May I kill that branch?

3. Recently I imported a new upstream version. According to [1] I should
rebase my patches. Unfortunately this fails:

<snip>
hille@sid:~/devel/rubber/rubber.git $ gbp pq rebase
gbp:info: Switching to 'patch-queue/debian/master'
First, rewinding head to replay your work on top of it...
Applying: more accurate log messages when deciding whether to rebuild
some file
Using index info to reconstruct a base tree...
M	src/depend.py
Falling back to patching base and 3-way merge...
Auto-merging src/depend.py
CONFLICT (content): Merge conflict in src/depend.py
error: Failed to merge in the changes.
Patch failed at 0001 more accurate log messages when deciding whether to
rebuild some file
hint: Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".

gbp:error: Couldn't run git rebase: it exited with 128
<snip>

Could anybody give me a hint, what it wrong here?

Many thanks!

Hilmar

[1] https://wiki.debian.org/Python/GitPackaging#New_upstream_release
-- 
sigfault
#206401 http://counter.li.org

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

Thread

[Debian PAPT] Question about salsa repo and packaging Hilmar Preuße <hille42@web.de> - 2018-09-15 17:50 +0200
  Re: [Debian PAPT] Question about salsa repo and packaging Sergio Durigan Junior <sergiodj@debian.org> - 2018-09-16 07:40 +0200
    Re: [Debian PAPT] Question about salsa repo and packaging Elena ``of Valhalla'' <valhalla-d@trueelena.org> - 2018-09-16 09:10 +0200
      Re: [Debian PAPT] Question about salsa repo and packaging Sergio Durigan Junior <sergiodj@debian.org> - 2018-09-16 19:00 +0200
    Re: [Debian PAPT] Question about salsa repo and packaging Hilmar Preuße <hille42@web.de> - 2018-09-22 21:10 +0200

csiph-web