Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add option to test-find-pivot to assist in discovering "name pivots" when diagnosing merge failures. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
3dc006c9dec71bb4ef5e392c89c7e4f7 |
User & Date: | andybradford 2016-11-07 08:24:17.656 |
Context
2016-11-07
| ||
11:26 | Fix the sync.wiki documentation to account for recent changes to the sync protocol. ... (check-in: df1205bb user: drh tags: trunk) | |
08:24 | Add option to test-find-pivot to assist in discovering "name pivots" when diagnosing merge failures. ... (check-in: 3dc006c9 user: andybradford tags: trunk) | |
05:43 | Minor correction to example comment in Fossil coding introduction. ... (check-in: 22a9fba4 user: andybradford tags: trunk) | |
Changes
Changes to src/pivot.c.
︙ | ︙ | |||
151 152 153 154 155 156 157 158 159 160 161 162 | db_finalize(&u1); return rid; } /* ** COMMAND: test-find-pivot ** ** Test the pivot_find() procedure. */ void test_find_pivot(void){ int i, rid; if( g.argc<4 ){ | > > > > > > | | | 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | db_finalize(&u1); return rid; } /* ** COMMAND: test-find-pivot ** ** Usage: %fossil test-find-pivot ?options? PRIMARY SECONDARY ... ** ** Test the pivot_find() procedure. ** ** Options: ** --ignore-merges Ignore merges for discovering name pivots */ void test_find_pivot(void){ int i, rid; int ignoreMerges = find_option("ignore-merges",0,0)!=0; if( g.argc<4 ){ usage("?options? PRIMARY SECONDARY ..."); } db_must_be_within_tree(); pivot_set_primary(name_to_rid(g.argv[2])); for(i=3; i<g.argc; i++){ pivot_set_secondary(name_to_rid(g.argv[i])); } rid = pivot_find(ignoreMerges); printf("pivot=%s\n", db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid) ); } |