Date: Thu, 20 Jan 2005 21:06:45 +0100
From: Jan Hudec <bulb@ucw.cz>
To: gnu-arch-users@gnu.org
Subject: Re: [Gnu-arch-users] strategy to handle back-fixies
Message-ID: <20050120200644.GA7715@vagabond>
References: <20050120090735.GA18766@vandal.simcon-mt.de>
Mime-Version: 1.0
In-Reply-To: <20050120090735.GA18766@vandal.simcon-mt.de>
User-Agent: Mutt/1.5.6+20040907i
Precedence: list
Content-Type: multipart/mixed; boundary="===============0931475380=="
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 3727
Lines: 102

--===============0931475380==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="PNTmBPCT7hxwcZjr"
Content-Disposition: inline


--PNTmBPCT7hxwcZjr
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 20, 2005 at 10:07:35 +0100, Andrei A. Voropaev wrote:
> Hello!
>=20
> I need an advice about the best strategy for the following situation.
>=20
> I have an archive for the project. Another archive contains simbolic
> tags (snapshots) from the first one. I have created snapshot X and have
> been working on new features for snapshot Y. During the work I've fixed
> couple of important though small bugs. Now my boss wants me to create
> snapshot Z that is identical to X but includes those important bug
> fixes.
>=20
> One obvious (for me :) way could be to create one more archive, tag into
                                                         ^^^^^^^
You definitely don't need an                             ARCHIVE
> it snapshot X, do the bug fixes and then tag from it into the snapshots
> archive. But I'm not sure if this is going to work and if this is an
> appropriate approach. Would it work when I add snapshot Y?

In fact, it's exactly what versions are for. The overall schema could
look like:

archive/foo--dev--0
    This is the "HEAD" where you work on the new features
archive/foo--release--1--base-0
    This is where you first released. Your snapshot X.
archive/foo--release--1--patch-1
    This is your snapshot Z. It does not matter whether you have
    merged and commited it or tagged it (tags-only branch), but
    I suggest mergeing, because tag-only branches behave a little
    strangely, because they always only contain the last log.
archive/foo--release--2--base-0
    This will be where you will eventualy create snapshot Y.

You can equaly well create the snapshot Z as
archive/foo--release--1.1--base-0
(by tagging).

Generaly, each major release should have new version. I suggest that you
number your releases so they sort correctly in lexicographical order and
map the revisions so that the last component is revision and all that
before is version. Ie:
foo 1.0   =3D> foo--rel--1--base-0
foo 1.0.1 =3D> foo--rel--1.0--patch-1 (where foo--rel--1.0--base-0 is tag
				     of the above and patch-1 adds the fixes)
foo 1.1   =3D> foo--rel--1--patch-1   (this simply adds minor features)
foo 1.1.1 =3D> foo--rel--1.1--patch-1 (where foo--rel--1.1--base-0 is tag
				     of foo--rel--1--patch-1)
foo 2.0   =3D> foo--rel--2--base-0    (tag of your --dev-- later on)

You should keep it all in a single archive. The dev might be in other
archive if you need to have different permissions on it (e.g. if you want
to make the release archive public, but keep the dev one private).

---------------------------------------------------------------------------=
----
						 Jan 'Bulb' Hudec <bulb@ucw.cz>

--PNTmBPCT7hxwcZjr
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

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

iD8DBQFB8A9URel1vVwhjGURArL5AJ910n4cv0V50gYpjka8E0v2L3C3dQCgr5Bn
5LatxZbNVZTiHwxRJ6pnG40=
=AhkW
-----END PGP SIGNATURE-----

--PNTmBPCT7hxwcZjr--


--===============0931475380==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/
--===============0931475380==--