Date: Thu, 28 Oct 2004 10:03:38 -0700 (PDT)
Message-Id: <200410281703.i9SH3cPl084792@xl2.seyza.com>
From: Thomas Lord <lord@emf.net>
To: tla@johnmeinel.com
In-reply-to: <418023CD.1000504@johnmeinel.com> (message from John Meinel on
	Wed, 27 Oct 2004 17:40:13 -0500)
Subject: Re: [Gnu-arch-users] Re: Potential flaw in patch-log pruning in
	proposal
References: <20041025210724.GA19744@merconline.com>	<200410272144.i9RLiYnd074868@xl2.seyza.com>
	<vpqoeinq0aw.fsf@ecrins.imag.fr> <418023CD.1000504@johnmeinel.com>
Cc: gnu-arch-users@gnu.org, Matthieu.Moy@imag.fr, jblack@merconline.com
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: 1603
Lines: 44


    > From: John Meinel <tla@johnmeinel.com>    > X-Accept-Language: en-us, en

    [about ./=merges]

    > I think the idea that the patch name gets kept, but you can optionally 
    > keep the patch-log itself is a good idea. So the '{arch}/=merged' file 
    > would contain the equivalent of
    > tla logs --merges

The ./=merges file records a version-specific history of the
application of two particular merge commands.  The merge commands
aren't built-in yet but could be: they are a special case of 
star-merge followed by one of two kinds of log pruning.

The contents of the ./=merges file is meaningless _unless_ the version
it is built for is managed as a mainline in the style of the process
spec I posted /and/ the versions merged into that mainline and
mentioned in =merges are one of the two kinds of submission version
described in the process spec.

So, no, the =merges file does not contain '--merges' data and doesn't
name any revisions merged in the patch-log from a submission version
with the sole exception of the highest numbered revision from the
submission version itself.

In other words, suppose that submission branch S contains logs for
versions S, T, U, and V.   We merge that into mainline M.   The S, T,
U, and V log additions are pruned from mainline and =merges is updated 
to mention the latest revision of S (which was just merged in).

-t


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