[darcs-users] Darcs backend for Gitit

Trent W. Buck trentbuck at gmail.com
Sun Jan 4 09:34:14 UTC 2009


Max Battcher <me at worldmaker.net> writes:

> Another strategy, since it's a Wiki that can continuously be edited,
> why not just entirely allow conflicts in the working repository for
> the Wiki and let people submit patches that conflict.  (That is, don't
> worry if the repository is always in a conflict-free state.)  Let the
> conflicts show up as errors in the Wiki output (I could see the use in
> a simple preprocessor to seek out darcs conflict markers and produce
> some sort of interesting markup) and let the next contributor (or the
> current contributor(s) if they are paying attention) fix the mess.  A
> heavily edited Wiki in such a fashion could certainly could be a
> brutal verification of darcs conflict operations and timings.  (To be
> honest, I've always thought Wikis should at least somewhat work that
> way anyway...  A wiki will show incorrect markup as ugly/an error, why
> are merge conflicts much different?)

+1, this is solid reasoning for something I'd been a bit too nervous to
suggest myself.  Even without the preprocessor, the output would be
reasonable except for the part with the conflicts, and to my mind that
would just mean that people are encouraged to fix the conflicts.



More information about the darcs-users mailing list