Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix issues in the graphical merge conflict resolution reported on the mailing list. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
60f09863327dadb3d7cb851e6175005a |
| User & Date: | drh 2011-02-22 12:18:28.491 |
Context
|
2011-02-22
| ||
| 20:30 | Do not do automatic login for "fossil server" and "fossil http" and "fossil cgi" unless the --localauth option is used. Continue to do automatic login for 127.0.0.1 connections for "fossil ui", though. Ticket [573727d6d93badc] check-in: f7a3c6deef user: drh tags: trunk | |
| 12:18 | Fix issues in the graphical merge conflict resolution reported on the mailing list. check-in: 60f0986332 user: drh tags: trunk | |
|
2011-02-21
| ||
| 22:26 | Added a few more external links to the "Reviews" page. check-in: 184500e46a user: drh tags: trunk | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1686 1687 1688 1689 1690 1691 1692 | ** editor Text editor command used for check-in comments. ** ** gdiff-command External command to run when performing a graphical ** diff. If undefined, text diff will be used. ** ** gmerge-command A graphical merge conflict resolver command operating ** on four files. | | | | 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 | ** editor Text editor command used for check-in comments. ** ** gdiff-command External command to run when performing a graphical ** diff. If undefined, text diff will be used. ** ** gmerge-command A graphical merge conflict resolver command operating ** on four files. ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" ** Ex: xxdiff "%original" "%baseline" "%merge" -M "%output" ** ** http-port The TCP/IP port number to use by the "server" ** and "ui" commands. Default: 8080 ** ** ignore-glob The VALUE is a comma-separated list of GLOB patterns ** specifying files that the "extra" command will ignore. ** Example: *.o,*.obj,*.exe |
| ︙ | ︙ |
Changes to src/merge3.c.
| ︙ | ︙ | |||
346 347 348 349 350 351 352 |
blob_zero(&x);
while( zInput[0] ){
for(i=0; zInput[i] && zInput[i]!='%'; i++){}
if( i>0 ){
blob_append(&x, zInput, i);
zInput += i;
}
| | | | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 |
blob_zero(&x);
while( zInput[0] ){
for(i=0; zInput[i] && zInput[i]!='%'; i++){}
if( i>0 ){
blob_append(&x, zInput, i);
zInput += i;
}
if( zInput[0]==0 ) break;
for(j=0; j<nSubst; j+=2){
int n = strlen(azSubst[j]);
if( strncmp(zInput, azSubst[j], n)==0 ){
blob_append(&x, azSubst[j+1], -1);
zInput += n;
break;
}
}
if( j>=nSubst ){
blob_append(&x, "%", 1);
|
| ︙ | ︙ | |||
418 419 420 421 422 423 424 |
azSubst[0] = "%baseline"; azSubst[1] = zPivot;
azSubst[2] = "%original"; azSubst[3] = zOrig;
azSubst[4] = "%merge"; azSubst[5] = zOther;
azSubst[6] = "%output"; azSubst[7] = zOut;
zCmd = string_subst(zGMerge, 8, azSubst);
printf("%s\n", zCmd); fflush(stdout);
fossil_system(zCmd);
| | > > > > | > | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 |
azSubst[0] = "%baseline"; azSubst[1] = zPivot;
azSubst[2] = "%original"; azSubst[3] = zOrig;
azSubst[4] = "%merge"; azSubst[5] = zOther;
azSubst[6] = "%output"; azSubst[7] = zOut;
zCmd = string_subst(zGMerge, 8, azSubst);
printf("%s\n", zCmd); fflush(stdout);
fossil_system(zCmd);
if( file_size(zOut)>=0 ){
blob_read_from_file(pOut, zOut);
unlink(zPivot);
unlink(zOrig);
unlink(zOther);
unlink(zOut);
}
fossil_free(zCmd);
fossil_free(zOut);
}
fossil_free(zPivot);
fossil_free(zOrig);
fossil_free(zOther);
}
blob_reset(&v1);
return rc;
}
|