From: Dan N. <dbn...@gm...> - 2010-03-29 21:50:34
|
On Mon, Mar 29, 2010 at 11:03 AM, Brian Paul <br...@vm...> wrote: > Brian Paul wrote: >> Ian Romanick wrote: >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >>> >>> Brian Paul wrote: >>>> Ian Romanick wrote: >>>>> -----BEGIN PGP SIGNED MESSAGE----- >>>>> Hash: SHA1 >>>>> >>>>> Final versions of both Mesa 7.8 and 7.7.1 have been released. Links on >>>>> the Mesa website will still need to be updated, but I think Brian has to >>>>> do that. >>>> I'll do that soon. >>>> >>>> >>>>> The tag in the GIT repository for Mesa 7.8 is 'mesa-7.8'. I had >>>>> originally intended to just use 7.8, but having a tag and a branch with >>>>> the same name makes GIT angry (i.e., you get "warning: refname '7.8' is >>>>> ambiguous."). >>>> Yeah, that's what I'm getting now - and I can't seem to update my 7.8 >>>> branch to the latest commit: >>>> >>>> $ git rebase origin/7.8 >>>> warning: refname '7.8' is ambiguous. >>>> Current branch 7.8 is up to date. >>>> >>>> I'm stuck at commit 59258498dc6fa51573b176d071644bd3e750b5ac now. Help? >>> Hmm... I did 'git tag -d 7.8' and that fixed the problem locally. I >>> thought pushing tags afterwards would delete the remote tag, but >>> apparently not. I'll try to solve that today. >> >> OK, "git tag -d 7.8" fixed the problem here. > > Grrr, the 7.8 tag comes back after a git-fetch though. You might just have to go on annarchy and do "git --git-dir=$the_repo tag -d 7.8". You might also be able to push an empty source to the remote with "git push origin :refs/tags/7.8". -- Dan |