On Wed, Mar 9, 2011 at 6:06 AM, Richard Hipp <[email protected]> wrote: > What if the fork has already been merged back together? Do we still warn > about forks that have already been "fixed"?
I think it would require 2 things to prevent a warning on a fork-child where the same push also contained a merge involving that child. First that the fork-child be directly involved in the merge (or maybe its direct child). Second that either (a) the sender first perform a preparatory backward traversal before sending commits, or (b) that the receiver queue the warnings until it has the chance to see if there is a merge commit involving that fork-child. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
