Re: Reiser4 and linux 2.6.0

From: Tupshin Harper <tupshin@tupshin.com>
To: Robert August Vincent II <bobvin@pillars.net>
Cc: Larry McVoy <lm@work.bitmover.com>,
	reiserfs mailing list <reiserfs-list@Namesys.COM>
Subject: Re: Reiser4 and linux 2.6.0
Date: Fri, 01 Aug 2003 09:27:29 -0700	[thread overview]
Message-ID: <3F2A94F1.2010502@tupshin.com> (raw)
In-Reply-To: <20030801161520.GA17083@pillars.net>

Robert August Vincent II wrote:

>Could you explain, in simple terms, to somebody who is unfamiliar with
>bitkeeper, how to pull the latest 2.6.0 and reiser4 code and do
>whatever you did to merge them?
>
>I'm not working on any SCM, and therefore downloaded bitkeeper using
>the "free" license.
>
>But I'm unclear (even after perusing the FAQ and docs) on how to do
>what you just described.
>
>Perhaps it would be as simple as:
>
>bk clone http://linux.bkbits.net/linux-2.5
>bk clone bk://bk.namesys.com/bk/reiser4-linux-2.5 linux-2.5
>cd linux-2.5/fs
>bk clone bk://bk.namesys.com/bk/reiser4
>
>But I doubt it...
>
Larry was kind enough to send me the patch of his results of this merge, 
but unfortunately it suffered from the same incompleteness problems that 
the recent diffs on the namesys ftp site do. They apply cleanly, but 
they completely omit the contents of the fs/reiser4 directory which has 
the bulk of the code. It seem that the problem resides with the reiser 
folks. Maybe they have some more complicated structure involving two 
trees. Not sure, but a correct patch looks like it has to come from the 
reiser4 team.

-Tupshin