git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ondrej Certik" <ondrej@certik.cz>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Git Mailing List" <git@vger.kernel.org>,
	"Fabian Seoane" <fabian@fseoane.net>
Subject: Re: git fast-export | git fast-import doesn't work
Date: Wed, 26 Nov 2008 11:18:35 +0100	[thread overview]
Message-ID: <85b5c3130811260218s7529914eyb56a05ec1ca34b8f@mail.gmail.com> (raw)
In-Reply-To: <85b5c3130811260135g4646bf72iaf57f599fdd21a0c@mail.gmail.com>

On Wed, Nov 26, 2008 at 10:35 AM, Ondrej Certik <ondrej@certik.cz> wrote:
> On Wed, Nov 26, 2008 at 1:14 AM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>> Hi,
>>
>> On Tue, 25 Nov 2008, Ondrej Certik wrote:
>>
>>> I would like to export our whole git repository to patches, and then
>>> reconstruct it again from scratch. Following the man page of "git
>>> fast-export":
>>>
>>> [...]
>>>
>>> However, the repository is very different to the original one. It
>>> contains only 191 patches:
>>
>> Can you try again with a Git version that contains the commit
>> 2075ffb5(fast-export: use an unsorted string list for extra_refs)?
>
> I tried the next branch:
>
> $ git --version
> git version 1.6.0.4.1060.g9433b
>
> that contains the 2075ffb5 patch. I haven't observed any change ---
> the "git log" still only shows 191 commits (git log --all shows
> everything).

I deleted all tags and then fast-exported and imported, now all the
commits show in "git log", however, the patches are wrongly connected.
Basically, both repositories are identical (including hashes) up to
this commit:

d717177d4  (fixed downloads instructions in the README and a typo)

However, the original repo (sympy-full-history-20081023) contains 3
children at this commit:

Parent: fecac34251934e98a05631440d3ce151585f2391 (David added to credits)
Child:  03ccb60798d62f94ac9d2ec9472dc7333f67b420 (Allow to specify
line width in 2D plotting.)
Child:  203124d834488781db5429d941eeb60e396990c8 (credits improvements)
Child:  77146885f1b7aa49184f27c2297488c3d1201106 (Speed "import sympy"
up as in the last release.)

but the newly created repository only 2:

Parent: fecac34251934e98a05631440d3ce151585f2391 (David added to credits)
Child:  203124d834488781db5429d941eeb60e396990c8 (credits improvements)
Child:  77146885f1b7aa49184f27c2297488c3d1201106 (Speed "import sympy"
up as in the last release.)


And from that point on, the hashes mishmatch and sometimes the commits
are just wrongly connected (e.g. for example d2dc6b3's parent is
0adafe3, but 0adafe3 was committed half a year later after
d2dc6b3...), so it's a mess. Also the checkouted files are not
complete.


Now, if you look at the "patches" file, to which I saved the results
of "git fast-export", you can find that the commit d717177d4  (fixed
downloads instructions in the README and a typo) has the mark :6540,
and if you search for this mark in the patches file, you can only find
2 children:

commit refs/heads/master
mark :6542
author Ondrej Certik <ondrej@certik.cz> 1198803347 +0100
committer Ondrej Certik <ondrej@certik.cz> 1198803347 +0100
data 21
credits improvements
from :6540
M 100644 :6541 README


and:

commit refs/heads/master
mark :6551
author Ondrej Certik <ondrej@certik.cz> 1198951670 +0100
committer Ondrej Certik <ondrej@certik.cz> 1198951670 +0100
data 48
Speed "import sympy" up as in the last release.
from :6540
M 100644 :6550 sympy/printing/preview.py


however, the third child doesn't contain the "from :6540":

commit refs/heads/master
mark :24
author Ondrej Certik <ondrej@certik.cz> 1198798384 +0100
committer Ondrej Certik <ondrej@certik.cz> 1198798384 +0100
data 101
Allow to specify line width in 2D plotting.


So imho that's a bug in git fast-export. What do you think?

Ondrej

  reply	other threads:[~2008-11-26 10:19 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-25 16:44 git fast-export | git fast-import doesn't work Ondrej Certik
2008-11-25 17:31 ` Michael J Gruber
2008-11-25 20:41   ` Miklos Vajna
2008-11-25 23:39     ` Ondrej Certik
2008-11-25 23:53       ` david
2008-11-25 23:44   ` Ondrej Certik
2008-11-25 17:34 ` Peter Baumann
2008-11-26  0:14 ` Johannes Schindelin
2008-11-26  9:35   ` Ondrej Certik
2008-11-26 10:18     ` Ondrej Certik [this message]
2008-11-26 15:35       ` Michael J Gruber
2008-11-26 15:50         ` Ondrej Certik
2008-11-26 16:35           ` Johannes Sixt
2008-11-27  2:05             ` Ondrej Certik
2009-05-03 19:06             ` Ondrej Certik
2008-11-26 16:40           ` Johannes Schindelin
2008-11-26 16:44             ` Michael J Gruber
2008-11-26 17:08               ` Johannes Schindelin
2008-12-07 11:25                 ` Alexander Gavrilov
2008-12-08 18:13                   ` Johannes Schindelin
2008-11-26 17:21             ` Ondrej Certik
2008-11-27  8:18               ` Andreas Ericsson
2008-11-26 10:18   ` Michael J Gruber
2008-11-26 12:46     ` Johannes Schindelin
2008-11-26 13:03       ` Ondrej Certik

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=85b5c3130811260218s7529914eyb56a05ec1ca34b8f@mail.gmail.com \
    --to=ondrej@certik.cz \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=fabian@fseoane.net \
    --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).