Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From 68e9acb8360510a4 To 04e1674c75b1cb4f
2023-04-17
| ||
21:50 | Merge latest changes from trunk. (Closed-Leaf check-in: 88a76afc user: mgagnon tags: merge-conflict-when-no-file-on-pivot) | |
2023-03-17
| ||
11:50 | CSS tweaks for the Blitz and Aroise skins to make it more apparent when Submit buttons are disabled. Based on forum post 4cbd254480d00dd2. (check-in: c0f62386 user: stephan tags: trunk) | |
2023-03-16
| ||
02:08 |
Produce merge conflict mark during merge when file exist in current version
and in version to be merged, but not in common ancestor.
Related forum discussion including test script: f035bbc8461da6d2. (check-in: 04e1674c user: mgagnon tags: merge-conflict-when-no-file-on-pivot) | |
2023-03-15
| ||
12:42 | A blitz skin forum CSS tweak from 224044aa2d8d2 to give visited links in the thread list a slightly different color. (check-in: 68e9acb8 user: stephan tags: trunk) | |
10:40 | (x)diff --context N, where N is a negative value, is now treated as infinite, per off-list feature request. (check-in: 16d3d8b0 user: stephan tags: trunk) | |
Changes to src/merge.c.
︙ | |||
760 761 762 763 764 765 766 | 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | - - - - - - - - - - - - - - - - - - + | debug_fv_dump( debugFlag>=2 ); } /************************************************************************ ** All of the information needed to do the merge is now contained in the ** FV table. Starting here, we begin to actually carry out the merge. ** |
︙ | |||
807 808 809 810 811 812 813 814 815 816 | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 | + + + + - + | vfile_to_disk(0, idv, 0, 0); } } db_finalize(&q); /* ** Do a three-way merge on files that have changes on both P->M and P->V. ** ** Proceed even if the file doesn't exist on P, just like the common ancestor ** of M and V is an empty file. In this case, merge conflict marks will be ** added to the file and user will be forced to take a decision. */ db_prepare(&q, "SELECT ridm, idv, ridp, ridv, %s, fn, isexe, islinkv, islinkm FROM fv" |
︙ |