[CDG5] Git abuse
Elliot Nunn
elliotnunn at fastmail.com
Wed Apr 3 02:04:16 AWST 2019
Since working on the 68k NewWorld ROM, I have used Git's commit tree to
track three things at once: my changes to make the code buildable, my
reconstruction of Apple's changes over time, and my desired changes to
the code. Making these patchsets play nicely together has been
difficult. Now, I am having difficulties reverting SuperMario to Cube-E
that make me think that the Git-tree approach is not entirely workable.
For example, it would be nice to show off a work in progress
withoutfollowing up with "but I will rebase it to oblivion in 20
minutes". Splitting and lumping code changes meaningfully has also been
a struggle.
My proposed solution is to store patchsets in a public repository.
Currently I am experimenting with the best `diff` settings to make these
readable to a casual browser. I envision a collection of named and
documented patchsets that can be manipulated by "applying" them into a
separate Git repository. All the while the canonical version lives in
the main public repository. Patchsets can be chained and scripts can be
inserted to allow us to express our increasingly sophisticated
understanding of the history of the code *and* its future potential.
Thoughts?
More information about the cdg5
mailing list