[darcs-users] Conflict marking

[Stephen J. Turnbull]

>>>>> "David" == David Roundy <droundy at darcs.net> writes:

    David> Indeed, both versions presented may be in states that no
    David> user has ever seen before, but I still think we're not too
    David> hosed.  [local] just means that "local changes would have
    David> led to this version."

If no user has ever seen them, it's likely that labelling it "local"
will be of no help to the user in figuring out which is which without
doing the careful semantic analysis.

Also, AFAICT there doesn't need to be any local version of the
conflict at all---eg, with the proposed "darcs pull repo1 ... repoN"
feature.  But the merge code won't know that unless it keeps track of
all previous patches (which it may have to do anyway, if so add source
patch information to the tracking data and we're golden; but it sounds
dubious from your other comments).


-- 
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba                    Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
               Ask not how you can "do" free software business;
              ask what your business can "do for" free software.