[darcs-users] Confused by conflict

Albert Reiner areiner at tph.tuwien.ac.at
Fri Apr 29 11:57:57 UTC 2005


[Albert Reiner <areiner at tph.tuwien.ac.at>, 28 Apr 2005 20:46:31 +0200]:
> I am absolutely confused by conflict handling in Darcs (version
> 1.0.2).
...

Some of that confusion has gone away, and the `darcs repair` behavior:

> Also, I can now run `darcs repair` as often as I want, either in NEW
> or in FOO: I always get a message about a pristine tree being fixed
> (shouldn't that go away after one application?), but diff finds no
> differences between the files under _darcs (this is the pristine, I
> suppose) and those in current-old.

seems to be unrelated to my manipulations but rather an effect of
being on NFS.

Albert.




More information about the darcs-users mailing list