From: "Shawn O. Pearce" <spearce@spearce.org>
To: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Cc: James Westby <jw+debian@jameswestby.net>,
git@vger.kernel.org,
Ian Clatworthy <ian.clatworthy@internode.on.net>
Subject: Re: "commit"s without "from" in fast-import
Date: Tue, 18 Mar 2008 22:06:25 -0400 [thread overview]
Message-ID: <20080319020625.GA3535@spearce.org> (raw)
In-Reply-To: <F4486D8E-3256-4FA7-89A7-3EC7E7D64162@orakel.ntnu.no>
Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> wrote:
> On 18. mars. 2008, at 04.43, Shawn O. Pearce wrote:
> [...]
> >Maybe we should make this more formalized in the documentation as
> >allowable, so if it does break for an importer the importer author
> >has to fix git-fast-import, bzr-fast-import, *-fast-import instead.
>
> In the interests of language strictness, I think it should be
> explicitly either allowed or forbidden, and if it is forbidden I think
> fast-import should barf on it.
Agreed.
> From a git perspective it seems ok to allow it, since a commit is
> only really a tree and a set of parent commits. "from" adds a parent
> and initialises the tree, "merge" adds a parent without touching the
> tree. But maybe I'm thinking too git-centrically.
>
> I can try to make a documentation patch that allows it and see if
> having it "on paper" makes it more or less reasonable.
I'm leaning towards leaving it in the language as allowed, and thus
documenting that this is not only possible, but actively used by
importers as it can be an easy way to setup a subsequent change
with no initial files.
But I have to wonder what the bzr-fast-import folks would say.
I've CC'd in James and Ian, as they have been working on the bzr
side for a little.
James, Ian -- to give you the short backstory we are talking about
creating a new branch _without_ a "from", but instead using a single
"merge" to specify the sole ancestor revision of a new commit to
be placed on the new branch. This allows the frontend to supply
all files for the tree as none were inherited from the sole ancestor.
The other (more obvious?) approach to accomplish the same result
is to use "from" followed by a "filedeleteall" to clear the files,
then supply the new files. Both approaches have the exact same
result in git-fast-import.
--
Shawn.
next prev parent reply other threads:[~2008-03-19 21:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-17 22:10 "commit"s without "from" in fast-import Eyvind Bernhardsen
2008-03-18 3:43 ` Shawn O. Pearce
[not found] ` <F4486D8E-3256-4FA7-89A7-3EC7E7D64162@orakel.ntnu.no>
2008-03-19 2:06 ` Shawn O. Pearce [this message]
2008-03-19 18:39 ` James Westby
[not found] ` <9A41E5AD-2305-457B-A214-7A11A1B559F6@orakel.ntnu.no>
2008-03-20 3:40 ` [PATCH] fast-import: Document the effect of "merge" with no "from" in a commit Shawn O. Pearce
[not found] ` <6FC571BB-D304-4D25-B1F2-1E03BD5438F8@orakel.ntnu.no>
2008-03-21 13:57 ` Eyvind Bernhardsen
2008-03-21 15:25 ` [PATCH v2] " Eyvind Bernhardsen
2008-03-23 5:00 ` Shawn O. Pearce
2008-03-23 6:17 ` Junio C Hamano
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=20080319020625.GA3535@spearce.org \
--to=spearce@spearce.org \
--cc=eyvind-git@orakel.ntnu.no \
--cc=git@vger.kernel.org \
--cc=ian.clatworthy@internode.on.net \
--cc=jw+debian@jameswestby.net \
/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).