From: Holger Hellmuth <hellmuth@ira.uka.de>
Date: Tue, 27 Mar 2012 15:46:25 GMT
Subject: Re: Merge-friendly text-based data storage
Message-ID: <4F71E0D1.2040600@ira.uka.de>
In-Reply-To: <7vzkb2jchu.fsf@alter.siamese.dyndns.org>

On 27.03.2012 17:21, Junio C Hamano wrote:
> Richard Hartmann<richih.mailinglist@gmail.com>  writes:
>
>>> the only way
>>> would be to store each data line in its own file. As you store file paths
>>> that would even fit, but I doubt it is what you had in mind
>>
>> I considered this as well, but that's extremely expensive and wasteful.
>
> And it does not solve anything.  The "version" file may cleanly merge to a
> new version, and there is no way for the merge result of "version" file to
> affect the outcome of merges in other files.

It solves the data merging.

And since a version change is presumably a very scarce event, this could 
be solved with a merge hook that simply aborts the merge with a message 
how to update the older version, then commit and merge.