On 9/25/17, Andy Goth <andrew.m.g...@gmail.com> wrote: > 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?
I was thinking of changing --baseline so that it records the merge baseline using a Q card instead of a P card, as if the merge were a cherrypick. -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
