Am 22.08.2020 um 11:16 teilte Andrey Rahmatullin mit: > On Sat, Aug 22, 2020 at 01:08:52AM +0200, Hilmar Preuße wrote:
Hi, >> One note: when I tried to do the push for the first time it told me >> there would be no "upstream/0.7+git73896501cf" tag, which was correct. >> The person who did the upload for debian/0.7+git73896501cf-1 did not >> update the "upstream" branch, hence the tag was not created. I fixed the >> upstream branch by doing an "gpb import-orig". Now the >> "upstream/0.7+git73896501cf" tags is more recent than the >> "debian/0.7+git73896501cf-2" tag. Could this cause issues? > > The tag creation dates are irrelevant. > In the gbp workflow the merge order is not relevant either as long as the > upstream tag content is correct. > Not sure about this statement, b/c this was finally the solution: - delete the debian/... tag locally and remotely - run again "gbp tag" and "gbp push" Have a look at attached screen session. Does that make sense? H. -- sigfault #206401 http://counter.li.org
hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ gbp push gbp:info: Pushing debian/0.7+git73896501cf-2 to origin gbp:info: Pushing upstream/0.7+git73896501cf to origin gbp:info: Pushing d8074c6b03512b4001b8e1ea06737afd989f139a to origin:refs/heads/master gbp:error: Error running git push: To salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git ! [rejected] d8074c6b03512b4001b8e1ea06737afd989f139a -> master (non-fast-forward) error: failed to push some refs to 'salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. gbp:info: Pushing refs/heads/upstream to origin:refs/heads/upstream gbp:error: Failed to push some refs. hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ git tag -d debian/0.7+git73896501cf-2 Deleted tag 'debian/0.7+git73896501cf-2' (was 07a5dad) hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ git tag debian/0.4-1 debian/0.7+git73896501cf-1 debian/0.7-1 upstream/0.4 upstream/0.7 upstream/0.7+git73896501cf upstream/0.7-1+gitc6dd2cb18d hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ gbp tag gbp:info: Tagging Debian package 0.7+git73896501cf-2 as debian/0.7+git73896501cf-2 in git hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ git push --delete origin debian/0.7+git73896501cf-2 To salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git - [deleted] debian/0.7+git73896501cf-2 hille@sid:~/devel/proftp/aaa_git/proftpd-mod-case_master $ gbp push gbp:info: Pushing debian/0.7+git73896501cf-2 to origin gbp:info: Pushing upstream/0.7+git73896501cf to origin gbp:info: Pushing refs/heads/master to origin:refs/heads/master gbp:info: Pushing refs/heads/upstream to origin:refs/heads/upstream
signature.asc
Description: OpenPGP digital signature
