Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch mistake Excluding Merge-Ins
This is equivalent to a diff from ae59f86383 to 3faa7222a6
|
2021-10-17
| ||
| 10:38 | Added variants of fsl_cx_exec() (fsl_db_exec() proxy) and changed error propagation semantics of fsl_cx_prepare() to be more useful. check-in: 9abdf965ac user: stephan tags: port-merge | |
|
2021-10-16
| ||
| 19:01 | This checkin was actually caused by a "CLI misinteraction," but that gives us an excellent opportunity to move it to its own branch for use with merge testing. Closed-Leaf check-in: 3faa7222a6 user: stephan tags: mistake | |
| 18:48 | f-test-merge: fixed an incorrect if/else branch of porting which included a path we don't want (automatic selection of a fork to merge in). Fixed a NULL dereference when --help was invoked. Added some debug output. check-in: ae59f86383 user: stephan tags: port-merge | |
| 16:24 | Minor code reorgs and reminders to self for the continued merge porting later on. check-in: 81e6402728 user: stephan tags: port-merge | |
Changes to f-apps/f-test-merge.c.
| ︙ | |||
775 776 777 778 779 780 781 782 783 784 785 786 787 788 | 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 | + + + |
fsl_db_each(db, fsl_stmt_each_f_dump, NULL,
"SELECT * FROM " FSL__TABLE_FV
" ORDER BY fn, fnp, fnm");
MARKER(("Contents of " FSL__TABLE_PIVOT ":\n"));
fsl_db_each(db, fsl_stmt_each_f_dump, NULL,
"SELECT * FROM " FSL__TABLE_PIVOT
" ORDER BY rid, pending, src");
MARKER(("Contents of [vmerge]:\n"));
fsl_db_each(db, fsl_stmt_each_f_dump, NULL,
"SELECT * FROM vmerge order by merge");
}
end:
if(0==rc){
fsl__renames_finalize(f);
rc = fsl_vfile_unload_except(f, vid);
}
|
| ︙ |