[darcs-users] Fwd: Towards a conflict-free revision control system.

[Jean-Philippe Bernardy]

Florent Becker <florent.becker <at> ens-lyon.org> writes:

> After reading the paper, what bother me the most is what happens in the case
> of lines added to non-existing files (in the external representation).
> Using darcs commands, what does bob see in his working dir at the end of
> the following sequence?
> 
> Alice: focal init
> Alice: touch toto; focal add toto; focal record -am 1
> Alice: echo bla > toto ; focal record -am 2
> Bob: focal init; focal pull --patch 2

Bob has a file with "bla" in some file.
That file is not attached to a specific location in the filesystem though;
you have it only in some internal directory.

This is the sort of situation that calls for a warning from the tool,
ideally hinting that some other patch should be pulled.
This isn't done yet though.

Cheers,
-- JP