Hi, On 24-10-17, John Norton wrote: > On 24/10/2017 18:02, Javier Domingo Cansino wrote: > Imho (what I would do) is just migrate current LEDE wiki content in OpenWRT > wiki, > while current OpenWRT stuff is either obsoleted (where it is replaced by the > LEDE wiki articles) or moved to suit the same general structure of LEDE > wiki.
Don't underestimate the amount of contributions made to the OpenWrt wiki during the LEDE/OpenWrt split. Old habits are hard to break :) Just diff'ing the dokuwiki files on the two servers would not be very useful, because there is no way to know if a chunk has been removed on one side (e.g. LEDE) or added on the other side (e.g. OpenWrt). This problem is well-known [1,2] and can be solved by having access to a common ancestor between the two versions. A possible way to do this would be to convert each wiki to a git repository [3], merge the two histories using git, and then convert back the git repository to a dokuwiki structure. It sounds tedious but feasible. Baptiste [1] http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html#merge [2] https://en.wikipedia.org/wiki/Merge_(version_control)#Three-way_merge [3] https://github.com/hoxu/dokuwiki2git
signature.asc
Description: PGP signature
_______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
