I had a problem of applying patches to the files that got indented differently meantime. So I wrote a tool that takes a context diff, rebuilds the before and a

I had a problem of applying patches to the files that got indented differently meantime. So I wrote a tool that takes a context diff, rebuilds the before and after text, then parses both as vectors of (leading whitespaces, token), then creates a diff of those vectors ignoring the whitespaces, parses the target file as a similar vector, and applies this diff to such a vector (again with ignoring/copying whitespaces) - after which it reconstructs the text. The results are surprisingly robust, despite the relatively naive tokenization heuristic. https://github.com/ayourtch/tbpatch https://github.com/ayourtch/tbpatch