Version mismatch when building trunk

[Thiago Macieira]

Em Quinta-feira 15. Outubro 2009, às 23.53.18, Chani escreveu:
> > > If git is not capable of updating a branch, can I at least clone the
> > > same
> >
> > It's capable of updating a branch.
> >
> > I chose not to. I chose to create a new one and force you to switch.
> >
> > >  URL and have the server figure out which branch this currently points
> > > to?
> >
> > Yes, it's already there. The recommended branch is stored in HEAD. Just
> >  keep resetting to kde-qt/HEAD.
> 
> [chani at brain kde-qt]$ git remote show origin
> * remote origin
>   Fetch URL: git://gitorious.org/+kde-developers/qt/kde-qt.git
>   Push  URL: git://gitorious.org/+kde-developers/qt/kde-qt.git
>   HEAD branch: 4.6-stable-patched
> 
> this is what you're referring to?

Yes.

> so if there *is* a way for people to set up their git repository so that it
> automagically updates to the latest recommended qt with just a 'git pull'
>  or whatever, can we have instructions for that please? :)

There is a way, provided you never have commits of your own on top.

git fetch origin HEAD
git reset --hard FETCH_HEAD


BTW, I've just pushed a 4.6.0-beta1-patched branch, if anyone is interested in 
it. It was very easy to create:
  git checkout -b 4.6.0-beta1-patched 4.6-stable-patched
  git merge v4.6.0-beta1
  git push kde-qt 4.6.0-beta1-patched
-- 
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: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20091016/002a6843/attachment.sig>