<blockquote>
<p>I thought we are trending towards using upstream as-is, with only small changes needed (including new files).</p>
</blockquote>
<p>Yes, we are, but currently it's only the <code>ctags/main</code> directory (there's the 6-line diff but I want to eliminate it as well - will do it in a separate pull request once this pull request is merged). But for <code>ctags/parsers</code> it's more like ~10000 LOC diff and for many parsers it will be a bi-directional process - we have some code that should be added upstream and some upstream code should be added to our parsers. I think in the current situation git subtree wouldn't be very practical.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/2132?email_source=notifications&email_token=AAIOWJ6B5JZTN3OVIJZZMITPW4R2VA5CNFSM4HIG4G52YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODWDYCCQ#issuecomment-495419658">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAIOWJ2LCMD2IA4QXMJA2DTPW4R2VANCNFSM4HIG4G5Q">mute the thread</a>.<img src="https://github.com/notifications/beacon/AAIOWJ3AUUKWNVD6ZPFISX3PW4R2VA5CNFSM4HIG4G52YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODWDYCCQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/geany/geany/pull/2132?email_source=notifications\u0026email_token=AAIOWJ6B5JZTN3OVIJZZMITPW4R2VA5CNFSM4HIG4G52YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODWDYCCQ#issuecomment-495419658",
"url": "https://github.com/geany/geany/pull/2132?email_source=notifications\u0026email_token=AAIOWJ6B5JZTN3OVIJZZMITPW4R2VA5CNFSM4HIG4G52YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODWDYCCQ#issuecomment-495419658",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>