Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.debian.maint.python > #7832
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Barry Warsaw <barry@debian.org> |
| Newsgroups | linux.debian.maint.python |
| Subject | git-dpm tag possible gotcha |
| Date | Wed, 04 Nov 2015 21:50:02 +0100 |
| Message-ID | <qrdai-5oe-15@gated-at.bofh.it> (permalink) |
| X-Original-To | <debian-python@lists.debian.org> |
| X-Mailbox-Line | From debian-python-request@lists.debian.org Wed Nov 4 20:45:14 2015 |
| Old-Return-Path | <barry@debian.org> |
| X-Amavis-Spam-Status | No, score=-11.9 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no |
| X-Policyd-Weight | using cached result; rate: -5 |
| X-Mailer | Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) |
| MIME-Version | 1.0 |
| Content-Type | multipart/signed; micalg=pgp-sha256; boundary="Sig_/Q876Uo=gsxJ5sRYlxS=tGUr"; protocol="application/pgp-signature" |
| X-Mailing-List | <debian-python@lists.debian.org> archive/latest/13145 |
| List-ID | <debian-python.lists.debian.org> |
| List-URL | <https://lists.debian.org/debian-python/> |
| List-Archive | https://lists.debian.org/msgid-search/20151104144454.3e42a707@anarchist |
| Approved | robomod@news.nic.it |
| Lines | 49 |
| Organization | linux.* mail to news gateway |
| Sender | robomod@news.nic.it |
| X-Original-Date | Wed, 4 Nov 2015 14:44:54 -0600 |
| X-Original-Message-ID | <20151104144454.3e42a707@anarchist> |
| Xref | csiph.com linux.debian.maint.python:7832 |
Show key headers only | View raw
[Multipart message — attachments visible in raw view] - view raw
I've occasionally seen this when I try to `git-dpm tag`: git-dpm: ERROR: 'upstream' differs from recorded one! In the past I've just done `git-dpm tag --refresh-upstream` but I think that's not the right thing to do. I think this means that you've `git pull`d while in master and the upstream branch is still behind (i.e. it's been fetched but not pulled). Sure enough, when I switched to the upstream branch I saw: Switched to branch 'upstream' Your branch is behind 'origin/upstream' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) I git pulled while in upstream, then checkout master and re-did the `git-dpm tag`. This time all was happy. FYI I suppose. -Barry
Back to linux.debian.maint.python | Previous | Next — Next in thread | Find similar | Unroll thread
git-dpm tag possible gotcha Barry Warsaw <barry@debian.org> - 2015-11-04 21:50 +0100
Re: git-dpm tag possible gotcha Brian May <bam@debian.org> - 2015-11-05 23:40 +0100
Re: git-dpm tag possible gotcha Scott Kitterman <debian@kitterman.com> - 2015-11-06 06:20 +0100
csiph-web