Starting with scintilla 4.x I would like to use a new method for import scintilla.

We keep a side branch scintilla-import that contains just plain upstream scintilla releases, i.e. the unpacked tarballs imported to git. This is done with a helper script achieve a linear history with file deletions properly reflected.

Integrating a release is done simply by merging the specific commit from the scintilla-import branch git merge scintilla-import.

The only downside is that we carry the complete tarball but we don't have to track/handle individual files anymore and properly handle deletions. Any changes we make to scintilla are automatically preserved by git merge


You can view, comment on, or merge this pull request online at:

  https://github.com/geany/geany/pull/2600

Commit Summary

File Changes

Patch Links:


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.