Le 22 févr. 06 à 17:52, Jason Dagit a écrit :
Conflicts are confusing, annoying and poorly implemented currently in darcs. I've heard that an external merge tool makes life better but I haven't had a chance to try it out yet.
I don't think darcs' conflict management is that bad, though I agree marking could be better.
The problem when working with tex files is that diffing algorithms work line by line. While this is mostly fine for source code (but diffing syntax trees could be better), it is definitively not good for tex prose where your sentences and paragraphs mostly span multiple lines.
The diff result of a tex file is generally not what really changed in the text -- what you are interested in -- but how the line by line layout of the paragraph changed in the source, which makes it hard to identify the actual textual change : word or sentence changes in a paragraph.
Diffing tex files first paragraph-wise and then, in paragraphs, token- wise would report textual changes more accurately and make conflicts much less frequent and easier to solve. One would then not try to resort to locking to avoid conflicts.
I guess the need for locking of the original poster is just because tex conflicts with line by line diffs are frequent and time consuming. If conflicts are easy to solve (as it is mostly with computer code) then you don't bother having some in exchange of more editing freedom. The culprit is the diff algorithm, not darcs. Repository/file settable smart diff algorithms would be nice, one can dream...
Regards, Daniel _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
