Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #7832 > unrolled thread

git-dpm tag possible gotcha

Back to article view | Back to linux.debian.maint.python

Contents

  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

#7832 — git-dpm tag possible gotcha

[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

[toc] | [next] | [standalone]

#7833

Barry Warsaw <barry@debian.org> writes:

> I've occasionally seen this when I try to `git-dpm tag`:
>
> git-dpm: ERROR: 'upstream' differs from recorded one!

I have regularly seen this problem and my upstream branch is up-to-date
with origin/upstream.

Seems to go away after I import a new upstream version and git-dpm tags
the new upstream version. Which of course requires a new upstream
version.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [next] | [standalone]

#7834

On Friday, November 06, 2015 09:32:01 AM Brian May wrote:
> Barry Warsaw <barry@debian.org> writes:
> > I've occasionally seen this when I try to `git-dpm tag`:
> > 
> > git-dpm: ERROR: 'upstream' differs from recorded one!
> 
> I have regularly seen this problem and my upstream branch is up-to-date
> with origin/upstream.
> 
> Seems to go away after I import a new upstream version and git-dpm tags
> the new upstream version. Which of course requires a new upstream
> version.

My experience has been similar.

Scott K

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web