Skip to content

Fails with a split/rearranged repo #8

Open
purcell opened this Issue Jul 20, 2011 · 4 comments

2 participants

@purcell
Owner
purcell commented Jul 20, 2011

When converting http://ocsigen.org/darcs/eliom.dev:

Importing patch 1817 of 1955:

================================================================================
PATCH : OCSIGEN SPLIT: removing xmlp4, deriving and ocsigenserver and
moving files around
DATE  : 2011-03-17 02:51:48 -0700
AUTHOR: gregoire.henry@pps.jussieu.fr => gregoire.henry
<gregoire.henry@pps.jussieu.fr>
--------------------------------------------------------------------------------
Backing up ./xmlp4/syntax/xhtmlparser.ml(-darcs-backup0)
Backing up ./xmlp4/syntax(-darcs-backup0)
Backing up ./xmlp4/xhtml/xML.ml(-darcs-backup0)
Backing up ./xmlp4/xhtml/xML.mli(-darcs-backup0)
Backing up ./xmlp4/xhtml(-darcs-backup0)
Backing up ./xmlp4(-darcs-backup0)
Backing up ./server/Makefile(-darcs-backup0)
Backing up ./server(-darcs-backup0)
Backing up ./http/ocsigen_headers.mli(-darcs-backup0)
Backing up ./http/ocsigen_headers.ml(-darcs-backup0)
Backing up ./http/ocsigen_http_com.ml(-darcs-backup0)
Backing up ./http/http_lexer.mll(-darcs-backup0)
Backing up ./http/Makefile(-darcs-backup0)
Backing up ./http(-darcs-backup0)
Backing up ./baselib/ocsigen_lib_cli.ml(-darcs-backup0)
Backing up ./baselib/ocsigen_lib.mli(-darcs-backup0)
Backing up ./baselib/Makefile(-darcs-backup0)
Backing up ./baselib(-darcs-backup0)
Backing up ./doc/src/menu.wiki(-darcs-backup0)
Backing up ./doc/src(-darcs-backup0)
Backing up ./doc/indexdoc(-darcs-backup0)
Backing up ./doc(-darcs-backup0)
We have conflicts in the following files:
./baselib ./baselib/Makefile ./baselib/ocsigen_lib.mli
./baselib/ocsigen_lib_cli.ml ./doc ./doc/indexdoc ./doc/src
./doc/src/menu.wiki ./http ./http/Makefile ./http/http_lexer.mll
./http/ocsigen_headers.ml ./http/ocsigen_headers.mli
./http/ocsigen_http_com.ml ./server ./server/Makefile ./src/doc
./xmlp4 ./xmlp4/syntax ./xmlp4/syntax/xhtmlparser.ml ./xmlp4/xhtml
./xmlp4/xhtml/xML.ml ./xmlp4/xhtml/xML.mli
Backing up ./doc(-darcs-backup1)
Darcs reports dirty directory: assuming conflict that is fixed by a
later patch... reverting
Backing up ./baselib(-darcs-backup1)
Backing up ./http(-darcs-backup1)
Backing up ./server(-darcs-backup1)
Backing up ./xmlp4(-darcs-backup1)
Finished reverting.
find: `./baselib-darcs-backup1': No such file or directory
find: `./server-darcs-backup1': No such file or directory
find: `./server-darcs-backup0': No such file or directory
find: `./xmlp4-darcs-backup0': No such file or directory
find: `./http-darcs-backup1': No such file or directory
find: `./baselib-darcs-backup0': No such file or directory
find: `./doc-darcs-backup0': No such file or directory
find: `./xmlp4-darcs-backup1': No such file or directory
find: `./http-darcs-backup0': No such file or directory
find: `./doc-darcs-backup1': No such file or directory
/usr/local/bin/darcs-to-git:150:in `run': Failed to run: ["find .
-name '*-darcs-backup[0-9]' -exec rm -rf {} \\;"] (RuntimeError)
       from /usr/local/bin/darcs-to-git:340:in `pull'
       from /usr/local/bin/darcs-to-git:323:in `pull_and_apply'
       from /usr/local/bin/darcs-to-git:545
       from /usr/local/bin/darcs-to-git:285:in `each_with_index'
       from /usr/local/bin/darcs-to-git:543:in `each'
       from /usr/local/bin/darcs-to-git:543:in `each_with_index'
       from /usr/local/bin/darcs-to-git:543
@hesselink

I got the same error just now when trying to import the Happstack darcs repo. Do you know of a way to work around this?

@purcell
Owner
purcell commented Feb 1, 2012

Unfortunately not. :-(

I'm unlikely to have time to investigate the problem myself, but I'm open to suggestions.

-Steve

@hesselink

I just successfully used darcs-fastconvert to do what I wanted, so the issue is not that pressing for me anymore. Thanks!

@purcell
Owner
purcell commented Feb 1, 2012

Great! Thanks for letting me know -- I hadn't seen darcs-fastconvert, and I'm happy it's there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.