[darcs-users] Re: Darcs spins

John Goerzen jgoerzen at complete.org
Mon Oct 25 17:39:02 UTC 2004


On 2004-10-25, Taral <taral at taral.net> wrote:
> On Mon, Oct 25, 2004 at 02:49:45AM +0000, John Goerzen wrote:
>> 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.
>
> If it reports a conflict, and you don't resolve it, darcs will
> eventually start eating a lot of CPU managing unresolved conflicts. The
> "old or new file" thing is fixed in a newer version of darcs.

I should have been more clear -- the questions were two distinct ones.

When it spins, it has not reported any conflict at all.

The conflicts I've seen on other similar merges that did not exhibit
this behavior.

-- John





More information about the darcs-users mailing list