Re: Fwd: Bug#958047: RFS: mercantile/1.0-1 [ITP] -- python3-mercantile - Web mercator XYZ tile utilities
On 5/3/20 4:30 PM, Joachim Langenbach wrote:
> Am Sonntag, 3. Mai 2020, 16:22:08 CEST schrieb Sebastiaan Couwenberg:
>> What output do you get from `git push --all && git push --tags`?
>
> The ouput of git push --all is:
> Enumerating objects: 136, done.
> ! [remote rejected] master -> master (pre-receive hook declined)
> ! [remote rejected] pristine-tar -> pristine-tar (pre-receive hook declined)
> ! [remote rejected] upstream -> upstream (pre-receive hook declined)
> error: failed to push some refs to 'git@salsa.debian.org:debian-gis-team/mercantile.git'
The pristine-tar & upstream branches should not fail.
Please ensure that the master branch is tracking origin/master and is up
to date:
$ git remote -v
origin https://salsa.debian.org/debian-gis-team/mercantile.git (fetch)
origin git@salsa.debian.org:debian-gis-team/mercantile.git (push)
git branch -avv
* master b719ca1 [origin/master] First
version of debian files
pristine-tar 0d26faf [origin/pristine-tar]
pristine-tar data for mercantile_1.1.3.orig.tar.gz
upstream 478e7e1 [origin/upstream] Fix
division on python 2.7
remotes/origin/HEAD -> origin/master
remotes/origin/master b719ca1 First version of debian files
remotes/origin/patch-queue/master f0169b1 Removed coveralls from test
requirements
remotes/origin/pristine-tar 0d26faf pristine-tar data for
mercantile_1.1.3.orig.tar.gz
remotes/origin/upstream 478e7e1 Fix division on python 2.7
If not:
git checkout master
git branch -u origin/master
git pull --rebase
git push --all
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
Reply to: