On 27.03.2012 17:21, Junio C Hamano wrote:
Richard Hartmann<richih.mailinglist@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html