Joe Orton wrote:
I also spent some time recently working out how to apply that process to srclib/pcre and it seemed fairly straight-forward. It seems like the process works OK even if the step to copy the original vendor pcre/current to srclib/pcre is skipped, so the current srclib/pcre can be used to merge into. The steps I came up with would be just:
import pcre-3.9 to vendor/pcre/current cp vendor/pcre/current vendor/pcre/pcre-3.9 unpack pcre-5.0 into vendor/pcre/current, svn add everything then commit verify that vendor/pcre/current exactly matches contents of pcre-5.0.tar.gz cp vendor/pcre/current vendor/pcre/pcre-5.0
and then the merge between pcre-3.9 and current can happen. You concur?
Yep. I just did that, and it worked as expected. I ended up with a clean merge: the only files that needed merge conflict resolution were those that had been modified in the srclib/pcre copy:
pcreposix.c (conflicts due to my old SMALL_NMATCH change, as expected; I replaced this whole file with the 5.0 version)
Makefile.in
configure.in
For the latter two files, I hand-merged just the essential changes from 5.0, leaving out the code that would require aclocal.
Brian
