Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor bug-fix when using -w or -Z flag in diff logic. Make sure that the common lines printed in a diff always come from the left-side, it might be that the right-side is different by white-space only. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | d38f0ce7597cc9afbf8dbd242fa07e0eec6f94a1 |
| User & Date: | jan.nijtmans 2014-03-07 20:14:24 |
Context
|
2014-03-08
| ||
| 04:05 | Turn mtime-changes off in repo_init test proc. check-in: 68cc26c1 user: joel tags: trunk | |
|
2014-03-07
| ||
| 20:14 | Minor bug-fix when using -w or -Z flag in diff logic. Make sure that the common lines printed in a diff always come from the left-side, it might be that the right-side is different by white-space only. check-in: d38f0ce7 user: jan.nijtmans tags: trunk | |
| 19:45 | Since Annotation flags and DIFF flags are so closely related, allow then to reside in a single variable check-in: 0bc584fe user: jan.nijtmans tags: trunk | |
Changes
Changes to src/diff.c.
425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 |
appendDiffLine(pOut, '+', &B[b+j], html, pRe);
}
b += m;
if( i<nr-1 ){
m = R[r+i*3+3];
for(j=0; j<m; j++){
if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html);
appendDiffLine(pOut, ' ', &B[b+j], html, 0);
}
b += m;
a += m;
}
}
/* Show the final common area */
assert( nr==i );
m = R[r+nr*3];
if( m>nContext ) m = nContext;
for(j=0; j<m; j++){
if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html);
appendDiffLine(pOut, ' ', &B[b+j], html, 0);
}
}
}
/*
** Status of a single output line
*/
|
| | |
425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 |
appendDiffLine(pOut, '+', &B[b+j], html, pRe);
}
b += m;
if( i<nr-1 ){
m = R[r+i*3+3];
for(j=0; j<m; j++){
if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html);
appendDiffLine(pOut, ' ', &A[a+j], html, 0);
}
b += m;
a += m;
}
}
/* Show the final common area */
assert( nr==i );
m = R[r+nr*3];
if( m>nContext ) m = nContext;
for(j=0; j<m; j++){
if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html);
appendDiffLine(pOut, ' ', &A[a+j], html, 0);
}
}
}
/*
** Status of a single output line
*/
|