From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: git branches and compilation
Date: Thu, 25 Jul 2013 11:53:43 -0700 [thread overview]
Message-ID: <130725115343.ZM1636@torch.brasslantern.com> (raw)
In-Reply-To: <CAD77+gS1z-QFATewW8Jje6tNnG1-ghGTVsZ0MOFku1hLA1AXnQ@mail.gmail.com>
On Jul 24, 4:25pm, Richard Hartmann wrote:
}
} As a word of warning, metastore's binary storage format is _not_ merge
} friendly. You must not diverge or branch off this file.
The .metadata files are not part of the git repository, they're listed
in .gitignore. Instead there is a separate subdirectory of metadata for
each git branch, which is maintained by the pre-commit and post-checkout
hooks.
As I mentioned, this is probably helpful only because I keep separate
build and source trees.
Thanks for the pointer to metamonger, though; I will look at it.
prev parent reply other threads:[~2013-07-25 18:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 19:46 Bart Schaefer
2013-06-17 10:57 ` Mikael Magnusson
2013-06-17 17:04 ` Bart Schaefer
2013-07-24 14:25 ` Richard Hartmann
2013-07-25 18:53 ` Bart Schaefer [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=130725115343.ZM1636@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).