Re: [Jython-dev] A new Jython DevGuide

[Jeff A. <ja...@fa...>]

It's not technically possible to merge the hg repo into the new git one 
derived from CPython's. I converted hg.python.org/jython-docs/devguide 
to git (using hg-fast-export), but the commits we would recognise as the 
same are not accepted as the same by git.

Git merge relies on finding the common ancestor I believe. If we want to 
keep pulling from the CPython version, we have to derive our guide from 
that, visibly to git. (Not that I'd thought this through in advance.)

I'll cherry-pick bits of text manually, which is more likely to be 
accurate than if I wrote them from scratch, and a bit quicker. Also, 
restoring the Mercurial instructions seems a good idea, rather than 
describing only a future world.

Jeff Allen

On 04/10/2017 19:27, fwi...@gm... wrote:
> Hi Jeff,
>
> http://www.jython.org/devguide/ is produced from a fork of the CPython
> devguide - though clearly it's really out of date. The repo is here:
> https://hg.python.org/jython-docs/devguide/
>
> Thanks for looking at this!
>
> On Sat, Sep 30, 2017 at 8:59 AM, Jeff Allen <ja...@fa...> wrote:
>> I created a repository in the project space on GitHub that is a clone of the
>> CPython devguide: https://github.com/jython/devguide
>>
>> The idea is to draw on the good work done recently (and still being done) by
>> CPython to define process and conventions for working on GitHub, which is
>> where, we've noted, we need to move. They've blazed a trail we'd be daft not
>> to follow wherever we can, and they have tools. In any case, that which is
>> not just process is also largely:
>>
>> Guidelines we refer to already;
>> Advice we should probably follow; and
>> Things mandatory on a PSF project.
>>
>> I'm hoping this will give us a much clearer reference for contributors, for
>> less work than maintaining those sections of the Jython wiki. If you visit
>> the CPython core developer part of the wiki it has been reduced to link into
>> the devguide. I suppose ours would go on jython.org eventually?
>>
>> I'm not sure how this will work: e.g. do we create name_jy.rst parallels;
>> can we edit mechanically; and is the Jython version on the master branch or
>> another? I've already done some deleting and re-making branches. So I'll
>> just try it and find out. At the moment I'm classifying chapters on a scale
>> of "irredeemably C-specific" through to "just as true for Jython". There are
>> not as many at the latter end as I'd hoped.
>>
>> The first outcome has been a minor contribution to the CPython version: to
>> make it build on Windows. This puts me on the contributing end of the
>> GitHub-based process as practised, which is a useful experience. I'm finding
>> review is very ... active :)
>>
>> Jeff
>>
>> --
>> Jeff Allen