From: Holger Hellmuth <hellmuth@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Richard Hartmann <richih.mailinglist@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: Merge-friendly text-based data storage
Date: Tue, 27 Mar 2012 17:46:25 +0200 [thread overview]
Message-ID: <4F71E0D1.2040600@ira.uka.de> (raw)
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.
prev parent reply other threads:[~2012-03-27 15:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-26 14:19 Merge-friendly text-based data storage Richard Hartmann
2012-03-26 18:17 ` Junio C Hamano
2012-03-26 19:06 ` Richard Hartmann
2012-03-26 19:51 ` Junio C Hamano
2012-03-27 9:12 ` Holger Hellmuth
2012-03-27 13:01 ` Richard Hartmann
2012-03-27 15:21 ` Junio C Hamano
2012-03-27 15:46 ` Holger Hellmuth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F71E0D1.2040600@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=richih.mailinglist@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).