From kde-core-devel  Sat Oct 17 22:27:23 2009
From: Chani <chanika () gmail ! com>
Date: Sat, 17 Oct 2009 22:27:23 +0000
To: kde-core-devel
Subject: Re: Version mismatch when building trunk
Message-Id: <200910171527.30645.chanika () gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=125581846929122
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart1980106.RxruSv6sXo"

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


> 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 changes, like
>  backports from Qt itself, are lost. We start anew.
>=20
> And this "starting anew" is something that the tool was not designed for.
> That's why it's slightly cumbersome for you.
>=20
> 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 it,=
 I
>  will not maintain it and will ignore it when it comes to bug reports.
>

ohhhh. so the difference between the 4.5 and the 4.6 branches in kde-qt isn=
't=20
fast-forward?
now this makes a bit more sense - I couldn't understand why you didn't just=
=20
create a branch and make everyone happy. :)

would it be an option to have a "recommended" branch that gets hard-reset=20
somehow to the latest branch, and tell people using that branch to pull -f?=
 or=20
would it cause trouble for other people using the repository?

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


btw, has anyone thrown that HEAD workaround up on techbase yet? :)

=2D-=20
This message brought to you by eevil bananas and the number 3.
www.chani3.com

--nextPart1980106.RxruSv6sXo
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)

iEUEABECAAYFAkraRMsACgkQeGbAwpIS3GyVlwCbBGFyB1Og9O4L5fM9cOL7B9xP
+uAAmMbd7LDriy+vCHHbLeH2YQEOdZU=
=hOQa
-----END PGP SIGNATURE-----

--nextPart1980106.RxruSv6sXo--