Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a bug in text-merge for the case when the same change occurs along both branches. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
58c74fc5c729ee9a33ac420e5592617a |
User & Date: | drh 2024-12-09 22:51:15 |
Context
2024-12-09
| ||
23:03 | Update the built-in SQLite to the latests trunk version, which includes fixes found in 3.47.2, plus other enhancements. ... (check-in: 077e53a3 user: drh tags: trunk) | |
22:51 | Fix a bug in text-merge for the case when the same change occurs along both branches. ... (check-in: 58c74fc5 user: drh tags: trunk) | |
22:45 | Gather more transformations for merge-info in a "fossil update". ... (check-in: 565a4906 user: drh tags: trunk) | |
Changes
Changes to src/merge3.c.
390 391 392 393 394 395 396 | static void txtChngV2(MergeBuilder *p, unsigned int nPivot, unsigned int nV2){ blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nPivot; blob_copy_lines(p->pOut, p->pV2, nV2); p->lnV2 += nV2; } static void txtChngBoth(MergeBuilder *p, unsigned int nPivot, unsigned int nV){ blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; | | | 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 | static void txtChngV2(MergeBuilder *p, unsigned int nPivot, unsigned int nV2){ blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nPivot; blob_copy_lines(p->pOut, p->pV2, nV2); p->lnV2 += nV2; } static void txtChngBoth(MergeBuilder *p, unsigned int nPivot, unsigned int nV){ blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; blob_copy_lines(0, p->pV1, nV); p->lnV1 += nV; blob_copy_lines(p->pOut, p->pV2, nV); p->lnV2 += nV; } static void txtConflict( MergeBuilder *p, unsigned int nPivot, unsigned int nV1, unsigned int nV2 |