python-argcomplete salvaging and possible team (re)join

2022-04-26 Thread duck
Quack, python-argcomplete has not been actively maintained and I did a NMU last year that got unacknowledged. I intend to salvage it. I think it would make sense to maintain it under the team's umbrella, which leads me to… I was part of the "Python Modules Team" between 2006 and 2009 but sinc

Re: Messed up a salsa commit - how best to fix?

2022-04-26 Thread Julian Gilbey
Hi Timo, On Tue, Apr 26, 2022 at 01:55:13PM +0200, Timo Röhling wrote: > Hi Julian, > > * Julian Gilbey [2022-04-26 11:03]: > > It turns out that I'd also messed up more than I'd realised: even when > > I pulled in the updated master branch, I didn't pull the upstream > > branch, so managed to i

Re: Messed up a salsa commit - Reporting the fix

2022-04-26 Thread Julian Gilbey
On Tue, Apr 26, 2022 at 01:26:26PM +0200, Geert Stappers wrote: > [...] > > So the state of the salsa repository was (in an ideal world where I'd > > pulled upstream): > > - master included the upstream/5.3.0 commit, tagged as upstream/5.3.0, > > along with further commits > > - upstream was at u

Re: Messed up a salsa commit - how best to fix?

2022-04-26 Thread Timo Röhling
Hi Julian, * Julian Gilbey [2022-04-26 11:03]: It turns out that I'd also messed up more than I'd realised: even when I pulled in the updated master branch, I didn't pull the upstream branch, so managed to introduce even more conflicts. Oh well. It's an easy mistake to write "git pull" if you

Re: Messed up a salsa commit - Reporting the fix

2022-04-26 Thread Geert Stappers
On Tue, Apr 26, 2022 at 11:03:24AM +0100, Julian Gilbey wrote: > Hi Timo (and Geert), ;-) > On Sun, Apr 24, 2022 at 10:42:51PM +0200, Timo Röhling wrote: > > Hi Julian, > > > > * Julian Gilbey [2022-04-24 21:01]: > > > Somehow I managed to really mess up a commit to python-qtconsole: the > >

Re: Messed up a salsa commit - how best to fix?

2022-04-26 Thread Julian Gilbey
Hi Timo (and Geert), On Sun, Apr 24, 2022 at 10:42:51PM +0200, Timo Röhling wrote: > Hi Julian, > > * Julian Gilbey [2022-04-24 21:01]: > > Somehow I managed to really mess up a commit to python-qtconsole: the > > upstream and pristine-tar branches do not have the upstream/5.3.0 > > sources (the

RFS: mercurial-keyring/1.4.3-1 -- Mercurial Keyring Extension

2022-04-26 Thread Christoph Mathys
Dear mentors, I am looking for a sponsor for my package "mercurial-keyring": * Package name: mercurial-keyring Version : 1.4.3-1 Upstream Author : Marcin Kasperski * URL : https://foss.heptapod.net/mercurial/mercurial_keyring * License : BSD-3-clause *

RFS: mercurial-extension-utils/1.5.2-1 -- Contains functions for writing Mercurial extensions

2022-04-26 Thread Christoph Mathys
Dear mentors, I am looking for a sponsor for my package "mercurial-extension-utils": * Package name: mercurial-extension-utils Version : 1.5.2-1 Upstream Author : Marcin Kasperski * URL : https://foss.heptapod.net/mercurial/mercurial-extension_utils * License