On 13:50 Wed 18 Feb     , Robin H. Johnson wrote:
> On Wed, Feb 18, 2009 at 01:24:20PM -0800, Donnie Berkholz wrote:
> > What are some other options? We could have a manifest directory instead, 
> > with 1 file inside per distfile.
> Please no. The space savings that came from using a single Manifest
> rather than the split digests per ebuild were significant.

Yeah, I know it's an unrealistic idea. Just trying to spout some off to 
try and spur better ones.

> If you look at the existing Manifests, there are 4 entry types:
> AUX
> EBUILD
> DIST
> MISC
> 
> DIST is the only one that needs something outside the directory to
> generate. It's also the most time-consuming to generate.
> 
> Using the converse, all files covered by AUX, DIST, MISC have GIT SHA1
> commit ids. Explicitly performing a checksum on them is not needed, just
> extract it from Git.
> 
> A distfile-only Manifest should merge extremely well, as it will seldom
> have conflicts.

I'd considered only the distfiles in manifests. There will still be a 
conflict every time there is a newer version in one branch (say an 
overlay, where the files are copied directly across and one bump is 
made) and older versions are deleted in the other branch (during a 
typical tree cleanup), right?

-- 
Thanks,
Donnie

Donnie Berkholz
Developer, Gentoo Linux
Blog: http://dberkholz.wordpress.com