Re: [Debian PAPT] Question about salsa repo and packaging
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
Reply to: