Fossil SCM

Fix an issue with the leaf-tracker that comes up if a check-in specifies a shunned check-in as its parent or merge parent.

drh 2011-03-14 21:36 trunk

Commit aa6abc5ed37a352e659d2c6ca2759f13b47aad45

Parent a6934b443778090…

1 file changed +3 -1

M src/leaf.c

+3 -1

		--- src/leaf.c
		+++ src/leaf.c
		@@ -109,11 +109,13 @@
109	109	** Schedule a leaf check for "rid" and its parents.
110	110	*/
111	111	void leaf_eventually_check(int rid){
112	112	static Stmt parentsOf;
113	113
114		- db_static_prepare(&parentsOf, "SELECT pid FROM plink WHERE cid=:rid");
	114	+ db_static_prepare(&parentsOf,
	115	+ "SELECT pid FROM plink WHERE cid=:rid AND pid>0"
	116	+ );
115	117	db_bind_int(&parentsOf, ":rid", rid);
116	118	bag_insert(&needToCheck, rid);
117	119	while( db_step(&parentsOf)==SQLITE_ROW ){
118	120	bag_insert(&needToCheck, db_column_int(&parentsOf, 0));
119	121	}
120	122

	--- src/leaf.c
	+++ src/leaf.c
	@@ -109,11 +109,13 @@
109	** Schedule a leaf check for "rid" and its parents.
110	*/
111	void leaf_eventually_check(int rid){
112	static Stmt parentsOf;
113
114	db_static_prepare(&parentsOf, "SELECT pid FROM plink WHERE cid=:rid");


115	db_bind_int(&parentsOf, ":rid", rid);
116	bag_insert(&needToCheck, rid);
117	while( db_step(&parentsOf)==SQLITE_ROW ){
118	bag_insert(&needToCheck, db_column_int(&parentsOf, 0));
119	}
120

	--- src/leaf.c
	+++ src/leaf.c
	@@ -109,11 +109,13 @@
109	** Schedule a leaf check for "rid" and its parents.
110	*/
111	void leaf_eventually_check(int rid){
112	static Stmt parentsOf;
113
114	db_static_prepare(&parentsOf,
115	"SELECT pid FROM plink WHERE cid=:rid AND pid>0"
116	);
117	db_bind_int(&parentsOf, ":rid", rid);
118	bag_insert(&needToCheck, rid);
119	while( db_step(&parentsOf)==SQLITE_ROW ){
120	bag_insert(&needToCheck, db_column_int(&parentsOf, 0));
121	}
122