In article <c1e460e2-036b-4604-8226-70e04af1e...@msys.ch>, Marc Balmer <m...@msys.ch> wrote: > >Am 19.07.2014 um 21:54 schrieb Alexander Nasonov <al...@yandex.ru>: > >> >> That's not how we update 3rd-party code in the tree. We use cvs import >> and resolve conflicts afterwards. > > >Oh well.. Having recent Lua is more important than following a procedure >that is difficult to follow.
The procedure is not complicated; it is important for everyone to follow otherwise we'll end up with an unmaintainable tree. The lua import needs to be corrected if it was not done on a vendor branch. Without a vendor branch we cannot effectively maintain diffs. The procedure is also documented in the developers guide: google "cvs netbsd howto". christos
