Fossil SCM
Fix the content_deltify() routine to always return an integer value. This fixes an error in the previous check-in (the --compress checkin). Also fix a help comment on the test-3-way-merge command.
Commit
60c2feea084ba6e2bf5378270ba876a8c6430ad0
Parent
301700a224211fa…
2 files changed
+2
-2
+2
+2
-2
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -757,12 +757,12 @@ | ||
| 757 | 757 | int s; |
| 758 | 758 | Blob data, src, delta; |
| 759 | 759 | Stmt s1, s2; |
| 760 | 760 | int rc = 0; |
| 761 | 761 | |
| 762 | - if( srcid==rid ) return; | |
| 763 | - if( !force && findSrcid(rid)>0 ) return; | |
| 762 | + if( srcid==rid ) return 0; | |
| 763 | + if( !force && findSrcid(rid)>0 ) return 0; | |
| 764 | 764 | if( content_is_private(srcid) && !content_is_private(rid) ){ |
| 765 | 765 | return 0; |
| 766 | 766 | } |
| 767 | 767 | s = srcid; |
| 768 | 768 | while( (s = findSrcid(s))>0 ){ |
| 769 | 769 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -757,12 +757,12 @@ | |
| 757 | int s; |
| 758 | Blob data, src, delta; |
| 759 | Stmt s1, s2; |
| 760 | int rc = 0; |
| 761 | |
| 762 | if( srcid==rid ) return; |
| 763 | if( !force && findSrcid(rid)>0 ) return; |
| 764 | if( content_is_private(srcid) && !content_is_private(rid) ){ |
| 765 | return 0; |
| 766 | } |
| 767 | s = srcid; |
| 768 | while( (s = findSrcid(s))>0 ){ |
| 769 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -757,12 +757,12 @@ | |
| 757 | int s; |
| 758 | Blob data, src, delta; |
| 759 | Stmt s1, s2; |
| 760 | int rc = 0; |
| 761 | |
| 762 | if( srcid==rid ) return 0; |
| 763 | if( !force && findSrcid(rid)>0 ) return 0; |
| 764 | if( content_is_private(srcid) && !content_is_private(rid) ){ |
| 765 | return 0; |
| 766 | } |
| 767 | s = srcid; |
| 768 | while( (s = findSrcid(s))>0 ){ |
| 769 |
+2
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -298,10 +298,12 @@ | ||
| 298 | 298 | return nConflict; |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | /* |
| 302 | 302 | ** COMMAND: test-3-way-merge |
| 303 | +** | |
| 304 | +** Usage: %fossil test-3-way-merge PIVOT V1 V2 MERGED | |
| 303 | 305 | ** |
| 304 | 306 | ** Combine change in going from PIVOT->VERSION1 with the change going |
| 305 | 307 | ** from PIVOT->VERSION2 and write the combined changes into MERGED. |
| 306 | 308 | */ |
| 307 | 309 | void delta_3waymerge_cmd(void){ |
| 308 | 310 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -298,10 +298,12 @@ | |
| 298 | return nConflict; |
| 299 | } |
| 300 | |
| 301 | /* |
| 302 | ** COMMAND: test-3-way-merge |
| 303 | ** |
| 304 | ** Combine change in going from PIVOT->VERSION1 with the change going |
| 305 | ** from PIVOT->VERSION2 and write the combined changes into MERGED. |
| 306 | */ |
| 307 | void delta_3waymerge_cmd(void){ |
| 308 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -298,10 +298,12 @@ | |
| 298 | return nConflict; |
| 299 | } |
| 300 | |
| 301 | /* |
| 302 | ** COMMAND: test-3-way-merge |
| 303 | ** |
| 304 | ** Usage: %fossil test-3-way-merge PIVOT V1 V2 MERGED |
| 305 | ** |
| 306 | ** Combine change in going from PIVOT->VERSION1 with the change going |
| 307 | ** from PIVOT->VERSION2 and write the combined changes into MERGED. |
| 308 | */ |
| 309 | void delta_3waymerge_cmd(void){ |
| 310 |