[Python-Dev] Split unicodeobject.c into subfiles?

[Chris Jerdonek]

On Thu, Oct 4, 2012 at 6:49 PM, Stephen J. Turnbull <stephen at xemacs.org> wrote:
> Chris Jerdonek writes:
>
>  > You can create multiple files this way.  I just verified it.  But the
>  > problem happens with merging.  You will create merge conflicts in the
>  > deleted portions of every split file on every merge.  There may be a
>  > way to avoid this that I don't know about though (i.e. to record that
>  > merges into the deleted portions should no longer occur).
> ...
> There's no other way to do it that I know of in any VCS because they
> all track conflicts at the file level.  (It would be straightforward
> to generalize git to handle this gracefully, but it would be a hugely
> disruptive change.  I don't know if Mercurial would be susceptible to
> such an extension.)

FWIW, I filed an issue in Mercurial's tracker to add support for
splitting files and copying subsets of files:

http://bz.selenic.com/show_bug.cgi?id=3649

As I thought it might be, the idea was rejected.

--Chris