Choosing the qt tree to file merge requests

[Thiago Macieira]

Em Segunda-feira 14 Setembro 2009, às 17:59:45, David Faure escreveu:
> On Saturday 12 September 2009, Thiago Macieira wrote:
> > Tag v4.6.0-tp1 pushed to kde-qt.git.
> 
> Grmbl, git is really complicated.
> 
> How do I switch to that tag?

Create a branch off the tag:

	git branch 4.6-tp1 v4.6.0-tp1

Then check it out.

I did not push a branch. I pushed a tag. They are different things in Git 
(that's different from SVN, which has no concept of tags).

> The only command that I tried that actually did something was:
> 
> git fetch origin tags/v4.6.0-tp1
> 
> but then what?
> 
> `git checkout v4.6.0-tp1` or `git checkout tags/v4.6.0-tp1` doesn't work,

Either should work.

They will checkout the tag, but since it's not a branch, if you commit, you 
won't change the tag (or any branch). That's what Git calls "detached HEAD": 
it's when you checked out something that is not a local branch.

> although git checkout --help says the argument can be a tag.
> `git checkout -b v4.6.0-tp1 v4.6.0-tp1` doesn't work either....
> 
> Why doesn't this work like git branch? (e.g. there's "git branch -r", but
> no way to list remote tags?)

Because tags aren't branches.

Tags are global. As soon as you fetched it, it should appear in "git tag".

Tags in Git are exactly what they are supposed to be, like they were in CVS: 
they tag a commit, indicating something about a commit. Tags can contain 
messages:

$ git show v4.6.0-tp1
tag v4.6.0-tp1
Tagger: Jason McDonald <jason.mcdonald at nokia.com>
Date:   Wed Sep 9 19:50:07 2009 +1000

Qt 4.6.0 Tech Preview 1 Release

commit c4c9b4457f0f760c1bf46dd8a309ab76eb128c1d
Author: aavit <qt-info at nokia.com>
Date:   Mon Sep 7 11:14:12 2009 +0200

    Fix for qfileinfo autotest: LocalDiskFile set also for non-existing file
[...]


Once again: I did not push a branch. I don't think it's time to start making 
4.6 changes to kde-qt.git. I recommend people track the *unmodified* qt.git 
branches 4.6 or 4.6-stable.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358

Qt Developer Days 2009 | Registration Now Open!
Munich, Germany: Oct 12 - 14     San Francisco, California: Nov 2 - 4
      http://qt.nokia.com/qtdevdays2009
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20090914/01e9fc5c/attachment.sig>