Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Skip missing merge parents. Git doesn't like missing marks and there isn't anything to be done about them. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
b71b32d131fe71f40dae41a65600312f |
User & Date: | joerg 2011-07-21 17:35:02.372 |
Context
2011-07-21
| ||
17:37 | Use stable marks derived from the rid in preparation for optional incremental exports. ... (check-in: 22d414e5 user: joerg tags: trunk) | |
17:35 | Skip missing merge parents. Git doesn't like missing marks and there isn't anything to be done about them. ... (check-in: b71b32d1 user: joerg tags: trunk) | |
15:50 | Avoid parsing manifests if a parent exists. Now the only case left using deleteall is when no parent exists. ... (check-in: bc8d368b user: joerg tags: trunk) | |
Changes
Changes to src/export.c.
︙ | ︙ | |||
192 193 194 195 196 197 198 199 200 201 202 203 204 205 | int parent; parent = db_column_int(&q2, 0); printf("from :%d\n", parent+firstCkin); db_prepare(&q3, "SELECT pid FROM plink" " WHERE cid=%d AND NOT isprim" " ORDER BY pid", ckinId); while( db_step(&q3)==SQLITE_ROW ){ printf("merge :%d\n", db_column_int(&q3,0)+firstCkin); } db_finalize(&q3); | > | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | int parent; parent = db_column_int(&q2, 0); printf("from :%d\n", parent+firstCkin); db_prepare(&q3, "SELECT pid FROM plink" " WHERE cid=%d AND NOT isprim" " AND NOT EXISTS(SELECT 1 FROM phantom WHERE rid=pid)" " ORDER BY pid", ckinId); while( db_step(&q3)==SQLITE_ROW ){ printf("merge :%d\n", db_column_int(&q3,0)+firstCkin); } db_finalize(&q3); |
︙ | ︙ |