[SciPy-dev] Docstring editing request on SciPy Doc Wiki
Mon May 19 12:04:11 CDT 2008
On Mon, May 19, 2008 at 10:50 AM, Stéfan van der Walt <firstname.lastname@example.org> wrote:
> 2008/5/19 Robert Kern <email@example.com>:
>> On Mon, May 19, 2008 at 3:58 AM, Stéfan van der Walt <firstname.lastname@example.org> wrote:
>>> For developers: please don't change docstrings directly in the source
>>> tree, it makes merging difficult. If you urgently need a change to go
>>> in, make it on the wiki and let me know.
>> Ooh. Not good. It's not time-critical, but this needs to be fixed.
> It's not a train smash -- but it causes some patches to be rejected.
> I don't think this is something that can be "fixed"; it's inherently a
> merge problem.
Okay, but this has to be a problem that the wiki->docstring system (or
its human operator) needs to deal with, not developers. It's just not
acceptable to have parts of the source that we can't edit directly.
Is the wiki->docstring code publicly available? 3-way merges are quite
typical, so I don't really understand why it would be especially hard
in this case.
"I have come to believe that the whole world is an enigma, a harmless
enigma that is made terrible by our own mad attempt to interpret it as
though it had an underlying truth."
-- Umberto Eco
More information about the Scipy-dev