[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Salsa upstream update



Hello list,

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?

Thanks,
hd


Reply to: