[darcs-users] Conflict marking

[Stephen J. Turnbull]

>>>>> "Thomas" == Thomas Zander <zander at kde.org> writes:

    Thomas> I respectfully disagree, based on talking with a lot of
    Thomas> people from a usability point of view (due to my
    Thomas> background) I know that the concept of 'local' is pretty
    Thomas> clear in peoples mind.

I didn't disagree with that.  My claim is that that clear concept of
"local" is *not* what darcs would label as "local" in many cases.

    Thomas> For Darcs this is extended to local-but-recorded-patches,
    Thomas> but most importantly its the *opposite* of the remote
    Thomas> repository we are pulling from.

That's what the user wants.  I don't believe darcs can give it to him
without adding substantial and possibly complex code to track which
patches have been applied so far.  I hope I'm wrong, of course.

However, I think it unlikely that *David Roundy* would have omitted
this if it were easy to do.  This is Darcs, not Arch, after all.  ;-)


-- 
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.