On 09/25/17 10:18, Richard Hipp wrote:
On 9/25/17, Andy Goth <[email protected]> wrote:
In response to Chris Rydalch saying that search-technote works for him,
in combination with it passing all my tests, I'd like to merge it to trunk.
What is the correct procedure for doing so?
At this point I'm inclined to just be patient and let
annotation-enhancements be merged first. That would solve everything.
Merged now.
Thank you for your testing and your corrections. I don't have access to
any Ubuntu systems, so I didn't spot the original problem you came
across. (No clue why Ubuntu has -Werror on by default, or whatever was
going on. Might want to explicitly turn on more warnings like -Wunused
or -Wall or even -Wextra to help spot these types of issues.)
As far as I can tell, in the general case I described in my previous
email, assuming waiting was not an option, the best to do would have
been to explicitly specify the -baseline option when merging the child
branch and later when merging its parent branch. But this MUST be done
in combination with additional testing to confirm that the child branch
wasn't actually dependent on anything in its parent branch. And of
course the final merge also must be tested to confirm it didn't leave
anything out due to -baseline being forgotten or mistyped. Thoughts?
--
Andy Goth | <andrew.m.goth/at/gmail/dot/com>
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
