Fossil SCM
prevent duplicate UUID's in P-card
Commit
4f443a3e7febc8eaaf21840febf5084bbf86ab9d
Parent
2918effe0d0aaae…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1013,11 +1013,11 @@ | ||
| 1013 | 1013 | free(zParentUuid); |
| 1014 | 1014 | db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0 OR id<-2"); |
| 1015 | 1015 | while( db_step(&q)==SQLITE_ROW ){ |
| 1016 | 1016 | char *zMergeUuid; |
| 1017 | 1017 | int mid = db_column_int(&q, 0); |
| 1018 | - if( !g.markPrivate && content_is_private(mid) ) continue; | |
| 1018 | + if( (!g.markPrivate && content_is_private(mid)) || (mid == vid) ) continue; | |
| 1019 | 1019 | zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid); |
| 1020 | 1020 | if( zMergeUuid ){ |
| 1021 | 1021 | blob_appendf(pOut, " %s", zMergeUuid); |
| 1022 | 1022 | if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate); |
| 1023 | 1023 | free(zMergeUuid); |
| 1024 | 1024 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1013,11 +1013,11 @@ | |
| 1013 | free(zParentUuid); |
| 1014 | db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0 OR id<-2"); |
| 1015 | while( db_step(&q)==SQLITE_ROW ){ |
| 1016 | char *zMergeUuid; |
| 1017 | int mid = db_column_int(&q, 0); |
| 1018 | if( !g.markPrivate && content_is_private(mid) ) continue; |
| 1019 | zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid); |
| 1020 | if( zMergeUuid ){ |
| 1021 | blob_appendf(pOut, " %s", zMergeUuid); |
| 1022 | if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate); |
| 1023 | free(zMergeUuid); |
| 1024 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1013,11 +1013,11 @@ | |
| 1013 | free(zParentUuid); |
| 1014 | db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0 OR id<-2"); |
| 1015 | while( db_step(&q)==SQLITE_ROW ){ |
| 1016 | char *zMergeUuid; |
| 1017 | int mid = db_column_int(&q, 0); |
| 1018 | if( (!g.markPrivate && content_is_private(mid)) || (mid == vid) ) continue; |
| 1019 | zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid); |
| 1020 | if( zMergeUuid ){ |
| 1021 | blob_appendf(pOut, " %s", zMergeUuid); |
| 1022 | if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate); |
| 1023 | free(zMergeUuid); |
| 1024 |