To: Colin Fox <cfox@cfconsulting.ca>
References: <41EEECAD.5070705@cfconsulting.ca>
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Mail-Followup-To: Colin Fox <cfox@cfconsulting.ca>,
	gnu-arch-users@gnu.org
Date: Thu, 20 Jan 2005 01:17:47 +0100
In-Reply-To: <41EEECAD.5070705@cfconsulting.ca> (Colin Fox's message of
	"Wed, 19 Jan 2005 15:26:37 -0800")
Message-ID: <vpqoefldkd0.fsf@ecrins.imag.fr>
User-Agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: gnu-arch-users@gnu.org
Subject: [Gnu-arch-users] Re: Archive configuration recommendations
Precedence: list
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: 1839
Lines: 57
Colin Fox <cfox@cfconsulting.ca> writes:

> 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:

In this case, the developer should have a mirror of his archive on a
public website. He doesn't need a dedicated server, just a ftp/http
hosting will do. Most ISP provide you this freely, and if it is to
develop free software, you also have sourcecontrol.net, gna.org, ...

Otherwise, you can use tla delta and send the changeset by email as a
tarball.

> ~        % tla get -A candice@candice.net--2003-candice \
> ~                hello-world--candice--0.1--patch-4 \
> ~                merge-temp

cd merge-tmp

> ~        % tla star-merge lord@emf.net--2003/hello-world--mainline--0.1
> "
>
> What is merge-temp? It's not used in the next command, so what's it's
> purpose?

tla get -H

> What happens after the star-merge?

You get all the unmerged changes in your working directory, then you
have to commit.

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

Yes. If you don't explicitely merge, no one is allowed to write on
your archive. A good contributor will star-merge /before/ sending a
merge request, to simplify the task of the integrator.

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

Since it's a wiki, feel free to fix them ;-)

-- 
Matthieu


_______________________________________________
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/