--nextPart2597415.JXSE1NPt3j
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Em S=C3=A1bado 17. Outubro 2009, =C3=A0s 03.32.36, Matthew Woehlke escreveu:
> I was referring to having to periodically switch branches. (Er...=20
> technically I think you are forgetting a 'git clone'? svn was two=20
> commands, 'co' and 'up'; with git you need clone, pull and occasionally=20
> checkout to change branches. Or maybe one of those can also do a clone=20
> when no repo exists yet, but...)

No.

The only extra thing you need because of Git itself is the cloning.

The branch switching is necessary because I changed the workflow. I did so=
=20
because we now have a public Qt Git repository with all real changes. So=20
instead of having a code dump and about a dozen commits per year, we now ha=
ve=20
a repository with over 10000 commits in the 6 months it has existed.

Qt itself has branches (4.5, 4.6-stable, 4.6, master-stable, master, plus a=
ll=20
the other repositories, like qt-x11-maemo:4.6-fremantle, kinetic:kinetic-
declarativeui, etc.) and tags.

The branch switching is necessary in the workflow I created because I'm=20
treating kde-qt branches as patch queues. Each time I create a new branch, =
I=20
reapply all the previous patches from KDE, while local changes, like backpo=
rts=20
from Qt itself, are lost. We start anew.

And this "starting anew" is something that the tool was not designed for.=20
That's why it's slightly cumbersome for you.

Like I said, we can change the workflow and just have one recommended "mast=
er"=20
branch. But since there will be no periodic cleanup done on it, I will not=
=20
maintain it and will ignore it when it comes to bug reports.

=2D-=20
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

--nextPart2597415.JXSE1NPt3j
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQBK2XKEM/XwBW70U1gRAgerAJ929MCVXCoACLZb88QA/AjPATF5nwCfVQZk
tYSG7d0gsC3N3sdwVO69FyM=
=n4Ns
-----END PGP SIGNATURE-----

--nextPart2597415.JXSE1NPt3j--