Fossil SCM
Skip missing merge parents. Git doesn't like missing marks and there isn't anything to be done about them.
Commit
b71b32d131fe71f40dae41a65600312f61b513bb
Parent
bc8d368b6605345…
1 file changed
+1
+1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -194,10 +194,11 @@ | ||
| 194 | 194 | parent = db_column_int(&q2, 0); |
| 195 | 195 | printf("from :%d\n", parent+firstCkin); |
| 196 | 196 | db_prepare(&q3, |
| 197 | 197 | "SELECT pid FROM plink" |
| 198 | 198 | " WHERE cid=%d AND NOT isprim" |
| 199 | + " AND NOT EXISTS(SELECT 1 FROM phantom WHERE rid=pid)" | |
| 199 | 200 | " ORDER BY pid", |
| 200 | 201 | ckinId); |
| 201 | 202 | while( db_step(&q3)==SQLITE_ROW ){ |
| 202 | 203 | printf("merge :%d\n", db_column_int(&q3,0)+firstCkin); |
| 203 | 204 | } |
| 204 | 205 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -194,10 +194,11 @@ | |
| 194 | parent = db_column_int(&q2, 0); |
| 195 | printf("from :%d\n", parent+firstCkin); |
| 196 | db_prepare(&q3, |
| 197 | "SELECT pid FROM plink" |
| 198 | " WHERE cid=%d AND NOT isprim" |
| 199 | " ORDER BY pid", |
| 200 | ckinId); |
| 201 | while( db_step(&q3)==SQLITE_ROW ){ |
| 202 | printf("merge :%d\n", db_column_int(&q3,0)+firstCkin); |
| 203 | } |
| 204 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -194,10 +194,11 @@ | |
| 194 | parent = db_column_int(&q2, 0); |
| 195 | printf("from :%d\n", parent+firstCkin); |
| 196 | db_prepare(&q3, |
| 197 | "SELECT pid FROM plink" |
| 198 | " WHERE cid=%d AND NOT isprim" |
| 199 | " AND NOT EXISTS(SELECT 1 FROM phantom WHERE rid=pid)" |
| 200 | " ORDER BY pid", |
| 201 | ckinId); |
| 202 | while( db_step(&q3)==SQLITE_ROW ){ |
| 203 | printf("merge :%d\n", db_column_int(&q3,0)+firstCkin); |
| 204 | } |
| 205 |