From: <com.git-scm@io7m.com>
To: git@vger.kernel.org
Subject: What's "wrong" with this fast-import?
Date: Sat, 12 Dec 2015 19:25:40 +0000 [thread overview]
Message-ID: <20151212192540.4ba49fea@viper.int.arc7.info> (raw)
Hello!
I'm trying to track down an issue with the Fossil SCM, specifically the
export feature that can produce the fast-import files consumed by Git.
The symptom of the bug seems to be that if a branch B is created from
branch A, files committed to B, and then B merged with A, the committed
files are not present in the head of A.
As an example:
http://waste.io7m.com/2015/12/12/fossilexport/
The given test.fossil repository was populated with the following steps:
1. Create fossil repository.
2. Add README.txt and commit in trunk.
3. Create branch 'b0' and switch to it.
4. Add README-b0.txt and commit in b0.
5. Switch to trunk.
6. Merge and commit 'b0'.
The HEAD of the fossil repository now contains README.txt and
README-b0.txt.
Exporting the repository (see test.export) produces:
--
blob
mark :4
data 7
Hello.
blob
mark :10
data 10
Hello b0.
commit refs/heads/trunk
mark :3
committer someone <someone> 1449930286 +0000
data 22
initial empty check-in
deleteall
commit refs/heads/trunk
mark :7
committer someone <someone> 1449930317 +0000
data 7
Initial
from :3
M 100644 :4 README.txt
commit refs/heads/b0
mark :9
committer someone <someone> 1449930338 +0000
data 28
Create new branch named "b0"
from :7
commit refs/heads/b0
mark :13
committer someone <someone> 1449930374 +0000
data 13
Add README-b0
from :9
M 100644 :10 README-b0.txt
commit refs/heads/trunk
mark :15
committer someone <someone> 1449930396 +0000
data 8
Merge b0
from :7
merge :13
--
Importing that into git produces a trunk branch that only
contains the file README.txt. Something is evidently being lost in the
merge, but it's not clear how.
Does anyone have any idea what Fossil is doing wrong?
M
next reply other threads:[~2015-12-12 19:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-12 19:25 com.git-scm [this message]
2015-12-13 0:53 ` What's "wrong" with this fast-import? SZEDER Gábor
2015-12-14 16:20 ` com.git-scm
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=20151212192540.4ba49fea@viper.int.arc7.info \
--to=com.git-scm@io7m.com \
--cc=git@vger.kernel.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.
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).