[darcs-users] Re: Darcs spins

Mark Stosberg mark at summersault.com
Mon Oct 25 12:14:57 UTC 2004


On 2004-10-25, John Goerzen <jgoerzen at complete.org> wrote:
>
> I tried the same trick with Hsemail.  darcs pull -av appears to work,
> but after it says "diffing dir...", it just sits there, using lots of
> CPU and doing nothing.  I let it go for quite awhile, and strace didn't
> show it actually accessing any files.
>
> Any ideas?
>
> Also, it's reported a conflict a couple of times, but I didn't see any
> real hints on exactly what the conflict was -- it seemed to just leave
> me with either the old or new file in a random manner.
>
> I couldn't really find anything on conflict resolution (without some
> sort of external command) in the docs... pointers?

What version of darcs are you using? Are you seeing "Conflicts in
pending", or conflicts in particular files? 

Until recently (I'm not sure it's been released yet) darcs would not
leave conflict markers in all cases. Now it will. I got confused by that
too. 

	Mark

-- 
http://mark.stosberg.com/ 





More information about the darcs-users mailing list