Actually it's even simpler than git-subtree. It becomes a simple merge.

On my fork, I pushed two branches, scintilla4 and scintilla-import.

• The latter contains the unmodified scintilla sources from tarball plus a script to mechanically import a new tarball.
• scintilla4 contains the master branch + a merge of that scintilla-import branch

The catch is that the merge retained all relevant Geany modifications to scintilla, i.e. GEANY_API_SYMBOL, selected lexers and build system integration; but to git we merged in the vanilla scintilla code. Therefore, future merges of that branch will only require a simple merge of that scintilla-import branch (git merge scintilla-import) and all Geany modifications will be left intact (unless they create conflicts of course).

The merge is crucial so that files deleted in upstream scintilla get deleted on our side as well.

However, it does mean we have to carry a complete copy of the scintilla sources. But I think that can be tolerated.

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