fast import produces no annotation history

[John Supplee]

Exporting a DARCS repository using `fast-export-from-darcs` and then importing using `fast-import` yields files with no annotation history. Doing

    bzr log

produces a proper history, but that is not reflected in the individual file history. All changes to files using annotate are related to the last revision in the repository.

There are no errors during the export or import processes and the repository files seem to be correct. The imports only ever produce one pack in the .bzr/repository/packs directory. I have had the same experience on 15 different repositories.

[John Supplee (jrsupplee)]

Forgot to mention that I am using version 2.0.1 of bzr

[Miklos Vajna (vmiklos)]

Hm, do you think this is a darcs-fast-export bug? If so, is this
reproducible with any other importers? I haven't seen this problem with
git.

[John Supplee (jrsupplee)]

Miklos Vajna wrote:
> Hm, do you think this is a darcs-fast-export bug? If so, is this
> reproducible with any other importers? I haven't seen this problem with
> git.
>
I just tried importing one of the repositories into git using "bzr
fast-export-from-darcs" to produce the input stream and the annotation
history appears correctly in git. That would seem to point to a problem
with "bzr fast-import"

[John Supplee (jrsupplee)]

Made a test Darcs repository with three patches (commits). Exported the repository using `bzr fast-export-from-darcs`. Got the following output:

<<START from-darcs.fi
progress [2009-11-24 17:10:57] parsing the inventory
progress [2009-11-24 17:10:57] getting list of patches
progress [2009-11-24 17:10:57] starting export, repo has 3 patches
commit refs/heads/master
mark :1
committer John Supplee <email address hidden> 1259075187 +0200
data 8
Patch #1
M 644 inline test.txt
data 16
This is a test.

commit refs/heads/master
mark :2
committer John Supplee <email address hidden> 1259075268 +0200
data 8
Patch #2
from :1
D test.txt
M 644 inline test.txt
data 55
This is a test.

This is the second part of the test.

commit refs/heads/master
mark :3
committer John Supplee <email address hidden> 1259075306 +0200
data 8
Patch #3
from :2
D test.txt
M 644 inline test.txt
data 78
This is a test.

This is the second part of the test.

This is the last test.

progress [2009-11-24 17:10:58] writing export marks
progress [2009-11-24 17:10:58] finished
>> END from-darcs.fi

Imported this to git and annotation history was preserved correctly. Imported it to bzr using `bzr fast-import` and the annotation history was NOT preserved. I then did a `git fast-export -M --all` from the git repository created earlier and got the following output:

<<START from-git.fi
blob
mark :1
data 16
This is a test.

reset refs/heads/master
commit refs/heads/master
mark :2
author John Supplee <email address hidden> 1259075187 +0200
committer John Supplee <email address hidden> 1259075187 +0200
data 8
Patch #1M 100644 :1 test.txt

blob
mark :3
data 55
This is a test.

This is the second part of the test.

commit refs/heads/master
mark :4
author John Supplee <email address hidden> 1259075268 +0200
committer John Supplee <email address hidden> 1259075268 +0200
data 8
Patch #2from :2
M 100644 :3 test.txt

blob
mark :5
data 78
This is a test.

This is the second part of the test.

This is the last test.

commit refs/heads/master
mark :6
author John Supplee <email address hidden> 1259075306 +0200
committer John Supplee <email address hidden> 1259075306 +0200
data 8
Patch #3from :4
M 100644 :5 test.txt

reset refs/heads/master
from :6

>>END from-git.fi

When the git output was imported into bazaar using `bzr fast-import` the annotation history appeared correctly.

So the conclusion of the matter is that bzr fast-import does not like the format of the fast import file produced by fast-export-from-darcs (although git is ok with it). I am not sure if this means that bzr fast import is broken or bazaar's Darcs fast export (or both?).

[Miklos Vajna (vmiklos)]

On Tue, Nov 24, 2009 at 05:49:24PM -0000, John Supplee <email address hidden> wrote:
> So the conclusion of the matter is that bzr fast-import does not like
> the format of the fast import file produced by fast-export-from-darcs
> (although git is ok with it). I am not sure if this means that bzr fast
> import is broken or bazaar's Darcs fast export (or both?).
>
> ** Attachment added: "DARCS Test Repository"
> http://launchpadlibrarian.net/36029461/test-darcs-repo.zip

'd2x -f git test' runs fine here, so the stream created from this repo
using darcs-fast-export can be imported to git without any problem.

I also checked that the output of

git clone test.git test.git.nonbare && diff --exclude .git --exclude
_darcs -Naur test test.git.nonbare

is empty.

I suspect that this is a bzr fast-import bug, then.