Re: Salsa upstream update
halfdog writes:
> Hello list,
>
> halfdog writes:
>> ... Could someone please give me a hint how to update a Salsa
>> project to current upstream?
>>
>> I try to follow
>>
>> https://wiki.debian.org/Diaspora/Packaging/UpdateUpstream
>>
>> but it seems, that there is no upstream branch for "gbp
>> import-orig". Therfore I believe I should follow
>>
>> https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.convert.html
>>
>> which recommends
>>
>> git branch upstream $(git log --format='%H' | tail -1)
>>
>> when the first Salsa commit is identical to the upstream commit
>> (it is and has ID 40ec386c55a619f401ba92f592f78b65d009d7e1).
>>
>> Still import-orig is unhappy afterwards.
>>
>> Is there something obvious wrong or is the github upstream
>> in an invalid state so that importing cannot work?
>>
>>
>> Commands used:
>>
>> gbp clone --pristine-tar --debian-branch=debian/sid
>> https://salsa.debian.org/halfdog-guest/guerillabackup.git
>> cd guerillabackup git branch upstream
>> 40ec386c55a619f401ba92f592f78b65d009d7e1 git branch --all
>> gbp import-orig --pristine-tar --uscan --verbose
>>
>> gbp:debug: ['git', 'rev-parse', '--show-cdup'] gbp:debug:
>> ['git', 'rev-parse', '--is-bare-repository'] gbp:debug: ['git',
>> 'rev-parse', '--git-dir'] gbp:debug: ['git', 'for-each-ref',
>> '--format=%(refname:short)', 'refs/heads/'] gbp:debug: ['git',
>> 'show-ref', '--verify', 'refs/heads/upstream'] gbp:debug:
>> ['git', 'status', '--porcelain'] gbp:info: Launching uscan...
>> gbp:error: Uscan failed - debug by running 'uscan --verbose'
>>
>>
>>
>> Also trying something like this does not help:
>>
>> git remote add upstream
>> https://github.com/halfdog/guerillabackup.git git fetch upstream
>> gbp import-orig --pristine-tar --upstream-branch upstream/master
>> --uscan ...
>>
>>
>> Any ideas?
>
> I think I found the solution by myself, at least it makes "gbp
> buildpackage" build the package.
>
> Could anybody please confirm that those steps are the Debian
> way to do it? The commands should run on any machine without
> the need to have any access credentials, ...
>
>
>
> gbp clone --pristine-tar --debian-branch=debian/sid
> https://salsa.debian.org/halfdog-guest/guerillabackup.git cd
> guerillabackup git config user.email "[your-mail]" git config
> user.name "[your-name]" git branch upstream
> 40ec386c55a619f401ba92f592f78b65d009d7e1
>
> git remote add --fetch -t master upstream
> https://github.com/halfdog/guerillabackup.git
>
> git merge --strategy=recursive --strategy-option=theirs v0.0.2
>
>
> After this automatic merge/merge-commit, some manual changes
> have to be done to follow upstream:
>
> * Fix merge error in "src/TransferService" line 89, delete
> 5 duplicated lines due to unexpected git-merge result from
> above.
>
> * Edit "debian/changelog" and bump version to "v0.0.2-1".
>
> * Copy "data/debian.template/guerillabackup.install" to
> "debian/guerillabackup.install" to account for deleted
> "Changelog.txt"
>
> * Edit "debian/patches/01-systemd-documentation" and remove
> patch for "guerillabackup-transfer.service" (already done upstream).
>
> * Edit "debian/upstream/metadata" to have new "Changelog:"
> reference
> "https://raw.githubusercontent.com/halfdog/guerillabackup/master/data/debian.template/changelog";
> instead.
>
>
> After that the changes can be commited to the Salsa repository,
> package being built:
>
> git commit . --message="V0.0.2-1 merged with upstream" git
> tag "v0.0.2-1" gbp buildpackage
>
>
>
> I uploaded the package to
> "https://mentors.debian.net/package/guerillabackup"; and it
> seems to be OK except for some lintian warnings, which seem
> easy to fix.
>
>
>
> Should I push the changes from above to the Salsa repository
> as a prerequisite for starting the sponsor search?
I just pushed it, ran "gbp buildpackage" and uploaded the package
to mentors.
Reply to: