On May 29, 2011 2:55 AM, "Stefan Küng" <tortoise...@gmail.com> wrote: > > On 29.05.2011 04:31, Greg Stein wrote: >> On May 28, 2011 1:39 PM, "Stefan Küng" <tortoise...@gmail.com >> <mailto:tortoise...@gmail.com>> wrote: >... >> > >> > I did a grep search for those functions, and the only files they >> showed up were the headers, no other files contained those function >> names. So it's not because of preprocessor conditionals. >> > >> > I'll wait until tomorrow. If there are no objections until then, I'll >> commit a change which removes those. >> >> For the conflict_skel functions, please wrap them in #if 0, rather then >> deleting them. We are going to use them for 1.8. >> >> The other two... as you wish. > > > An #if 0 won't help with extractor.py at all. It will still extract the functions.
Eep. Good point. > > If the functions are needed in 1.8, can't we just add them once they're really needed? Sure. My concern was just getting them back when needed. I guess we can just rely on 'svn log' and track down the right revision. Cheers, -g
