[darcs-devel] Darcs-git: works!
Juliusz Chroboczek
Juliusz.Chroboczek at pps.jussieu.fr
Fri Jul 15 16:31:14 PDT 2005
Sorry to spam everybody.
$ time /home/local/darcs/darcs-unstable/darcs pull -a ../git-20050622
Finished pulling and applying.
real 3m51.812s
user 3m31.317s
sys 0m2.997s
$ darcs changes | wc
8389 47822 338459
$
In other words, Darcs-git is now able to import the full contents of
the Git git repository. (This is the Git git repository, not the
Linux-Kernel git repository.)
There some bug somewhere which causes three blank lines (litterally
three) to appear out of nowhere after a very complex merge. But other
than that, it looks correct.
I've just spent a few hours tracking down a rather nasty bug in
Darcs-git. The bug was caused by a merge which carries the following
comment:
This merge itself is pretty interesting too, since it shows off a
feature of git itself that is incredibly cool: you can merge a
_separate_ git project into another git project. Not only does this
keep all the history of the original project, it also makes it possible
to continue to merge with the original project and the union of the two
projects.
I don't think anybody else can do that.
Do you think we should tell him?
Juliusz
More information about the darcs-devel
mailing list