Converting from Darcs

[Elliott Slaughter]

Hi,

I am attempting to convert a Darcs repo to Mercurial, using
ConvertExtension. The RepositoryConversion page on the wiki [1] says
ConvertExtension supports Darcs, but the ConvertExtension page [2] says that
patch conflicts aren't handled well. I'm not sure what to believe, but when
I convert the repository, there are differences between the source and
destination directories, and it looks like some patches may not have merged
correctly. I am using Mercurial 1.4 and Darcs 2.1.2 on Ubuntu 8.04. The
Darcs repo in question is publicly available at [3].

$ hg convert blackthorn-0.2
$ cd blackthorn-0.2-hg
$ hg update
$ cd ..
$ diff -rq blackthorn-0.2 blackthorn-0.2-hg/
Only in blackthorn-0.2-hg/: .hg
Only in blackthorn-0.2: _darcs
Files blackthorn-0.2/blackthorn.asd and blackthorn-0.2-hg/blackthorn.asd
differ
Files blackthorn-0.2/src/blackthorn/actor.lisp and
blackthorn-0.2-hg/src/blackthorn/actor.lisp differ
Files blackthorn-0.2/src/blackthorn/component.lisp and
blackthorn-0.2-hg/src/blackthorn/component.lisp differ
Files blackthorn-0.2/src/blackthorn/game.lisp and
blackthorn-0.2-hg/src/blackthorn/game.lisp differ
Files blackthorn-0.2/src/blackthorn/graphics.lisp and
blackthorn-0.2-hg/src/blackthorn/graphics.lisp differ
Files blackthorn-0.2/src/blackthorn/main.lisp and
blackthorn-0.2-hg/src/blackthorn/main.lisp differ
Files blackthorn-0.2/src/blackthorn/package.lisp and
blackthorn-0.2-hg/src/blackthorn/package.lisp differ

What can I do to resolve these differences?

Thanks.

[1] http://mercurial.selenic.com/wiki/RepositoryConversion#Darcs
[2] http://mercurial.selenic.com/wiki/ConvertExtension#Converting_from_Darcs
[3] http://common-lisp.net/~eslaughter/darcs/blackthorn-0.2/

-- 
Elliott Slaughter

"Don't worry about what anybody else is going to do. The best way to predict
the future is to invent it." - Alan Kay
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20091124/5ca6654b/attachment.htm>