From kde-core-devel  Sat Oct 17 23:02:47 2009
From: Thiago Macieira <thiago () kde ! org>
Date: Sat, 17 Oct 2009 23:02:47 +0000
To: kde-core-devel
Subject: Re: Version mismatch when building trunk
Message-Id: <200910180102.47562.thiago () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=125582065231233
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart4033275.MRjh9bna6q"

--nextPart4033275.MRjh9bna6q
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable

Em Domingo 18. Outubro 2009, =E0s 00.27.23, Chani escreveu:
> > The branch switching is necessary in the workflow I created because I'm
> > treating kde-qt branches as patch queues. Each time I create a new
> > branch, I reapply all the previous patches from KDE, while local change=
s,
> > like backports from Qt itself, are lost. We start anew.
> >
> > And this "starting anew" is something that the tool was not designed fo=
r.
> > That's why it's slightly cumbersome for you.
> >
> > Like I said, we can change the workflow and just have one recommended
> >  "master" branch. But since there will be no periodic cleanup done on i=
t,
> > I will not maintain it and will ignore it when it comes to bug reports.
>=20
> ohhhh. so the difference between the 4.5 and the 4.6 branches in kde-qt
>  isn't fast-forward?

No. Because of KDE patches.

> now this makes a bit more sense - I couldn't understand why you didn't ju=
st
> create a branch and make everyone happy. :)
>=20
> would it be an option to have a "recommended" branch that gets hard-reset
> somehow to the latest branch, and tell people using that branch to pull -=
f?
>  or would it cause trouble for other people using the repository?

If you ever rewrite history in a branch people are using, you have to tell=
=20
each and everyone of them to be extremely careful. They must not pull or pu=
ll=20
=2D-rebase. They have to reset, manually, then cherry-pick any commits they=
 had=20
before.

Which is why rewriting history is not part of any normal workflow.

> it sounds like what we really want is some kind of movable tag... but git
>  tags can't move...

Tags never move. Branches move.

We really want a branch. It's just that, like I said above, the workflow=20
doesn't include resetting. And that's what's needed if history rewrites are=
=20
expected.

=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

--nextPart4033275.MRjh9bna6q
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)

iD8DBQBK2k0XM/XwBW70U1gRAsagAJ9WYHoCC/h+zj/K/Zp2ngNt4lJSbwCfZttQ
X/kBxjRnnYLj7i0T2VQiqlQ=
=frVk
-----END PGP SIGNATURE-----

--nextPart4033275.MRjh9bna6q--