Daniel Carrera writes:
> Ok. "Darcs understands dependencies between patches. You can't rename
> a file before you add it. You can't delete line before you write it."
^
+1 except "a" -------------------------------+
> > Something says "this needs work" to me. Specifically, you mention
> > "conflict" "too many" times, and do not focus enough on how Darcs
> > normally makes things go smoothly.
>
> Well... I was trying to talk about how it finds conflicts. How about this:
But on the top page we want to imply "that never happens. ... Well,
hardly ever."<wink>
> "Darcs understands when two patches can be reordered and when they can't
> (e.g. Bob can't rename file foo.txt to bar.txt if Alice already rename
> it to something else). Understanding patch dependencies means that Darcs
> will generally only issue a warning when there is a genuine conflict
> (Alice and Bob must agree on a name)."
>
>
> It says roughly the same thing, but I think it gives the feeling that
> conflicts are rare.
Yes, much better. Another nit: I'm not sure if it's worth doing, but
"You can't merge Bob's patch renaming foo to bar with Alice's patch
renaming it to something else" is a little more accurate than "if
Alice already renamed it". It's also harder to understand, though, so
maybe it's better left to a more detailed page.
> > pull B; darcs pull A". But that's not patch reordering, that's "pull
> > reordering".
>
> I call that patch reordering in the documentation.
OK. I think I'm going to wait until the site comes up and I can
browse it pretending I'm a n00b before making further comments.
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
