From: Junio C Hamano <gitster@pobox.com>
To: Richard Hartmann <richih.mailinglist@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Merge-friendly text-based data storage
Date: Mon, 26 Mar 2012 11:17:45 -0700 [thread overview]
Message-ID: <7vfwcvp6pi.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAD77+gRTv4Aq_4FLAQcD9E0p7VBD7h6hQq3CJ9Wo5DU9Zjt+Hg@mail.gmail.com> (Richard Hartmann's message of "Mon, 26 Mar 2012 16:19:39 +0200")
Richard Hartmann <richih.mailinglist@gmail.com> writes:
> As long as there are no lines that start with the same file name, this
> file format would allow for efficient merging _if_ git has an internal
> concept of line identifiers.
You can write a custom low-level merge driver, and use the attribute
system to mark that your file is meant to be handled by that ll-merge
driver. There is no need for Git to have "an internal concept of line
identifiers".
It may be of interest to run "git help attributes" and read up on
"Defining a custom merge driver" section.
next prev parent reply other threads:[~2012-03-26 18:17 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 [this message]
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
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=7vfwcvp6pi.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).