Date: Thu, 20 Jan 2005 11:16:34 +1100
From: Matthew Palmer <mpalmer@hezmatt.org>
To: gnu-arch-users@gnu.org
Message-ID: <20050120001634.GJ16408@hezmatt.org>
Mail-Followup-To: gnu-arch-users@gnu.org
References: <41EEECAD.5070705@cfconsulting.ca>
Mime-Version: 1.0
In-Reply-To: <41EEECAD.5070705@cfconsulting.ca>
User-Agent: Mutt/1.5.6+20040907i
Subject: [Gnu-arch-users] Re: Archive configuration recommendations
Precedence: list
Content-Type: multipart/mixed; boundary="===============1061333512=="
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: 3877
Lines: 112

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


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

On Wed, Jan 19, 2005 at 03:26:37PM -0800, Colin Fox wrote:
> The example in the tutorial for using Star-merge is way too short. It
> seems to assume that the non-mainline developer's archive is in the
> mainline developer's list of archives, which may not be true
> (particularly if the developer is developing on a laptop with a dynamic
> IP). From the wiki:

That's where a mirror comes in.  I have a similar situation for myself -- I
hack on my (frequently disconnected) laptop, and then push changes out to
the mirror on my website for the archives that are likely to be of interest
to anyone else.

Your developers could do a similar thing -- have their own private archive
on their laptops, mirror it to (say) your company webserver (or intranet, or
whatever) and then everyone else can register those mirrors and work from
those.

> "In ordinary use, you invoke star-merge  in the tree you want to merge
> info, providing as an argument the tree you want to merge from:
>=20
>=20
> ~        % tla get -A candice@candice.net--2003-candice \
> ~                hello-world--candice--0.1--patch-4 \
> ~                merge-temp
>=20
> ~        % tla star-merge lord@emf.net--2003/hello-world--mainline--0.1
> "
>=20
> What is merge-temp? It's not used in the next command, so what's it's
> purpose?

There appears to be a missing command there -- between those two tla
commands there should be a 'cd merge-temp'.  As per the 'get' docs, that
final argument specifies a directory to put the checked-out tree into.

> What happens after the star-merge?

The set of changes between the current working copy and the specified
revision (hello-world--mainline--0.1--patch-<last>) is calculated, and then
applied to the current tree.  You should then review the applied changes,
fix any conflicts, and then commit those changes to your tree, thus
completing the merge.

Caveat: Don't do a merge into a tree with uncommitted changes.  It can be
done, but it's a bit messy.

> What state is the mainline in

Largely irrelevant.  Nothing is changed in the mainline by your merge.

> and what happens when 'candice' wants to re-get the stuff from
> mainline. Does she also star-merge?

candice just got stuff from mainline in the previous commands.  If she wants
to merge again, she re-runs the exact same command, and tla is clever enough
to work out what to merge and what not to re-merge.

The alternate action, where mainline wants candice's changes, is a
star-merge again -- this time, we get hello-world--mainline--0.1 and then
tla star-merge candice@candice.net--2003-candice/hello-world--candice--0.1.

> (Also, there are lots of typos in the wiki -- "..you want to merge info")

Feel free to fix up any typos you find.  It doesn't look like they're
mandating registration for edits yet.

- Matt

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

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

iD8DBQFB7vhiBEnrTWk1E4cRAiL+AKCnROxEcvPUL9PZj7DS8wA//dB6kQCfQPOv
XGBBS77WxQWJ71iR12/AWas=
=Y1wd
-----END PGP SIGNATURE-----

--Yia77v5a8fyVHJSl--


--===============1061333512==
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/
--===============1061333512==--