[darcs-users] darcs conflicts/dependencies -- is patch theory the place to start?

Owen Stephens darcs at owenstephens.co.uk
Tue Sep 11 09:27:28 UTC 2012


On 11 September 2012 10:23, Owen Stephens <darcs at owenstephens.co.uk> wrote:

> > So as an outsider trying to understand the theory:
> > - There's lots of talk of conflicts/dependencies.
> > - But it's all very abstract, very few examples,
> > - and no distinction between duplicates vs hunk conflicts, etc.
> > - Are there perhaps different sub-categories of conflicts?
> > - Are some less intractable than others?
>
>
> In order:
>  - Yes.
>  - Yes - but the key ideas can (with effort) be understood with a high
> level
>          of abstraction. A user manual or UI-facing output on the other
> hand
>          must give the user more information!
>  - No - there is a distinction, at least internally (which as I've
> described,
>         does cause issues...)
>  - Yes & No -
>

Oops, looks like I got distracted at this point of the email :-)

I think I was going to say something about things either conflicting or not
conflicting, no middle ground. But that some conflicts are easier to
resolve: two replaces of the same token are "easy" - make the user pick
one/neither, but two complicated overlapping hunks are less easy to fix and
require the user to manually move text around.

Cheers,
Owen.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20120911/39aa4870/attachment.html>


More information about the darcs-users mailing list