To: Aaron Bentley <abentley@panoramicfeedback.com>
Mail-Followup-To: gnu-arch-users@gnu.org
Subject: Re: [Gnu-arch-users] Potential flaw in patch-log pruning in proposal
References: <20041025210724.GA19744@merconline.com>
	<200410272144.i9RLiYnd074868@xl2.seyza.com>
	<41803AEC.1050209@panoramicfeedback.com>
	<200410281727.i9SHRS8v084841@xl2.seyza.com>
	<41814B9E.5040601@panoramicfeedback.com>
	<200410282006.i9SK6Kk2086420@xl2.seyza.com>
	<418156C2.3010506@panoramicfeedback.com>
From: Matthew Dempsky <jivera@flame.org>
Date: Sun, 31 Oct 2004 01:02:25 -0500
In-Reply-To: <418156C2.3010506@panoramicfeedback.com> (Aaron Bentley's
	message of "Thu, 28 Oct 2004 16:29:54 -0400")
Message-ID: <87is8r8lxq.fsf@flame.org>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: gnu-arch-users@gnu.org, Thomas Lord <lord@emf.net>
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: 1819
Lines: 44
Aaron Bentley <abentley@panoramicfeedback.com> writes:

> Thomas Lord wrote:
>>     > From: Aaron Bentley <abentley@panoramicfeedback.com>
>>     > Thomas Lord wrote:
>>     > >     > From: Aaron Bentley <abentley@panoramicfeedback.com>
>>     > >     > One of the features of Arch I really like is the
>> history-sensitive     > >     > merging.  This process breaks
>> history-sensitive merge commands.
>>     > > That is a complete misapprehension.
>>     > No, that is totally accurate.  The process that Matthew
>> Dempsky used to     > commit patch-7 breaks all conceivable
>> history-based merge commands, and     > requires a human to
>> determine its origins.
>> You're full of it.
>
> Unless you can demonstrate that the information is not lost, *you're*
> full of it.  If there's no history, there can't be history-based
> commands.
>
> Tell me exactly how I can determine that patch-7 is derived from
> jblack@gnuarch.org--2004/tla--devo--1.2--patch-25 and
> aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-22
> without recource to human intelligence.

For what it's worth, patch-7 was generated by star-merging
jivera@flame.org--2004/tla--get-changeset-fix--1.3.  Presumably under
the modifications to the process Tom has recommended, you would be
able to additionally know that.  (Right now that's not evident,
however.)

I expect the necessary changes can be made by simply commiting a patch
to add =merges with all the versions I've merged patches from, or if
it's necessary to know in the individual patches I can undo all the
work I've done right now and remerge them.


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