2013/8/2 Jan Nijtmans <jan.nijtm...@gmail.com>: > If the merged is not a leaf anymore, due to the commit itself, I > would expect this function to protect from adding a "closed" tag > (even though it doesn't really harm here). > > Hm.....
Bug fixed here: <http://www.fossil-scm.org/index.html/info/9eb3f5f605> Thanks very much, Stephan and Andy, for testing the (illegal) usage of --integrate on a fork merge. What is supposed to happen is: $ fossil merge --integrate cannot use --backout, --cherrypick or --integrate with a fork merge Correct! $ fossil merge --integrate trunk ...... "fossil undo" is available to undo changes to the working checkout. Here the "fossil merge" is fooled in thinking this is NOT a fork merge, by implicitly using "trunk" as argument. $ fossil commit .... Not_Closed: 4a89da5de27bee058f4cc6a358fb9bd6726b4c0b (not a leaf any more) That is what I expect! The commit itself already removes the "Leaf" status from the node, so adding the "closed" tag doesn't make sense any more. The is_a_leaf() function gave the wrong answer because the manifest_crosslink() function was not called yet, which is supposed to adapt the tables to the new situation. Thanks for noticing this! Regards, Jan Nijtmans _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
