Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: =?UTF-8?Q?Hilmar_Preu=c3=9fe?= Newsgroups: linux.debian.maint.python Subject: Re: [Debian PAPT] Question about salsa repo and packaging Date: Sat, 22 Sep 2018 21:10:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Sat Sep 22 19:06:10 2018 Old-Return-Path: 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: =?UTF-8?Q?Hilmar_Preu=c3=9fe_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:Iu9dlV4reC2XMVqBsoXppwbTgJXYMHdYol8n9IuMmaULBLoG/GC jgKQuZUB35p6kfm1Zo1X3evxZ9h/4WW4pKzLlt5EO5JgrXwde3B2AWeLpmG4u68qJnkg4VW GAhdT5E7M0YzaBO+uLDhgMXNCQAqbDK0fddE/Gkc+VZ/y+CdaBHIP73rKoPNnGe89m48A2u Qq4yP8oFQeQ0Fftjai+SA== X-Ui-Out-Filterresults: notjunk:1;V01:K0:+G2b5D6hEJI=:xthTIC72yvfKyU6uSjpDlm dhBgADZbytM+e+0mJunTckJ/79jYoJ+g1RYY3PUfJnbHv2f2mxEkEtU87FB5tL0Uzqq+Bbws+ PMkWjHaWxKl6N9QTEFhVnOZ39SnnflT9A3RKmIVGnTrw9iqAJntrABZ03DTCaApve2SrmRY5X Iog3LXy+PaBzK6SUP4DJ++FPtAVv4a6BcIPkYO3XNQHjn2pxY92YJuVv0Sq7nJ7EelqnThr/Q xuTJOTFOIKSUq/Q0RWaHcDArz4mJgoA/xPDKXaJne26ceZaFBv5gOwwRKWfh4SfQnDgWCh80X Ruis8nbLvCCv3DIFqSumK4CmTyE2Hw2ydFNOnpep8dLaefSwZS2yIQ9hxjZlQgcfwNE/A6NDX gEHTxSBsvDPoX378fQq5+uDMteb6gWoSGB+uZSccZM/oyNJqqZMlml1hgipnr7v3OYz573Kod uwZ0FvXWaXXFl8sgPNWQHb/X7mrSzqcmK3UjogH8xP6LdM0M/ZtR3D3Jza1t4NkAMs3CHUJwt DQTkj8bDxO4UxiVuHtjhSx3h7NZXuUnpuAG20GQ3qZKI6XyNNGaiG3GT46eH1q9X0gFh0u7Wk qdjf9S7B/RxdWEO/KVIuqnAd8O8F1sqx2j8X0bBHvBU8cJuLW/d+bgquL3uE2QP38xmD5gt54 1Sud/VQ/lvVWAUufNPcPMm8gMVsbMP8b8A8ST0iqdUqQPE9odbzX6/qCbOnAVgwen/k6TWOcj ay2O0RTM+G61EzJ8ZCGEZAOAmJDWSRmkrfCiSNADVrka8RybskRbZiMTmYwYpHTpPo2DDyq3i jhBl/zDYq5EYdpBkyanj+RkQ1QW74P9Qk6R641waBg4CgIlroA= X-Mailing-List: archive/latest/16358 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/0b737c0b-4700-76ef-3f47-b3bcea359a72@web.de Approved: robomod@news.nic.it Lines: 41 Sender: robomod@news.nic.it X-Original-Date: Sat, 22 Sep 2018 21:05:55 +0200 X-Original-Message-ID: <0b737c0b-4700-76ef-3f47-b3bcea359a72@web.de> X-Original-References: <87ftyaatyi.fsf@debian.org> Xref: csiph.com linux.debian.maint.python:10929 On 16.09.2018 07:32, Sergio Durigan Junior wrote: > On Saturday, September 15 2018, Hilmar Preuße wrote: 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? > > You mean do a "git reset --hard" locally and then "git push" the > modified history? This is not ideal, but if you're the only one using > the repository, and if there was no Debian release containing the code > you're reverting, then I'd say it's OK. > I now deciced to use revert and it is OK for me. Thanks for the hint! >> 3. Recently I imported a new upstream version. According to [1] I should >> rebase my patches. Unfortunately this fails: >> >> Could anybody give me a hint, what it wrong here? > > While rebasing the patch-queue, there was a conflict with one of the > files. A conflict happens when you have two distinct versions of the > same file containing modifications that are not trivial to be > automatically merged by git. The conflict is marked above as: > > CONFLICT (content): Merge conflict in src/depend.py > > You now have to resolve this conflict before proceeding. Basically, > open the file and look for the conflict markers, which look like: > For any reason the phenomenon is gone now. One of my patches was updated, during rebase. Hilmar -- sigfault #206401 http://counter.li.org