git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ondrej Certik" <ondrej@certik.cz>
To: "Michael J Gruber" <git@drmicha.warpmail.net>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"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 16:50:14 +0100	[thread overview]
Message-ID: <85b5c3130811260750y2e24436ye2426ccfc2f66071@mail.gmail.com> (raw)
In-Reply-To: <492D6CC3.2050408@drmicha.warpmail.net>

On Wed, Nov 26, 2008 at 4:35 PM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Ondrej Certik venit, vidit, dixit 26.11.2008 11:18:
>> 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:
>
> There's some nice 3 way branching and double 2 way merging going on. I
> cut out the interesting part of the graph, making d717177d4 and
> 6e869485f parentless. The resulting mini DAG is reproduced correctly by
> export|import, even with -M -C.

I am also trying to make the example simpler. I tried to squash the
first uninteresting ~1500 commits into one, but "git rebase -i"
uterrly fails after squashing about 600 commits. Still investigating.

Ondrej

  reply	other threads:[~2008-11-26 15:51 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
2008-11-26 15:35       ` Michael J Gruber
2008-11-26 15:50         ` Ondrej Certik [this message]
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=85b5c3130811260750y2e24436ye2426ccfc2f66071@mail.gmail.com \
    --to=ondrej@certik.cz \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=fabian@fseoane.net \
    --cc=git@drmicha.warpmail.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).