Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch rons diff mods Excluding Merge-Ins
This is equivalent to a diff from b72eb4d4b2 to 6a84934b44
|
2011-06-23
| ||
| 17:48 | Update the build-in SQLite to the lastest 3.7.7 release candidate. ... (check-in: 4722e1ab77 user: drh tags: trunk) | |
| 11:24 | added version diff from info page ... (Closed-Leaf check-in: 6a84934b44 user: ron tags: rons diff mods) | |
| 08:56 | added "diff from other version" to fdiff page ... (check-in: b785f08608 user: ron tags: rons diff mods) | |
|
2011-06-21
| ||
| 11:38 | fix [ffa87168ce1] ... (check-in: b72eb4d4b2 user: ron tags: trunk) | |
| 00:51 | Update the built-in SQLite to the latest 3.7.7 release candidate. ... (check-in: 74cbfc69ad user: drh tags: trunk) | |
Changes to src/info.c.
| ︙ | ︙ | |||
514 515 516 517 518 519 520 |
if( showDiff ){
@ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a>
}else{
@ <a href="%s(g.zTop)/vinfo/%T(zName)">[show diffs]</a>
}
}
@
| | > > > > > > | 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 |
if( showDiff ){
@ <a href="%s(g.zTop)/ci/%T(zName)">[hide diffs]</a>
}else{
@ <a href="%s(g.zTop)/vinfo/%T(zName)">[show diffs]</a>
}
}
@
@ <a href="%s(g.zTop)/vpatch?from=%S(zParent)&to=%S(zUuid)">[patch]</a>
@ <form method="get" action="%s(g.zTop)/vdiff">
@ See difference from another version:
@ <input type="text" name="to"/>
@ <input type="hidden" name="from" value="%S(zParent)"/>
@ <input type="submit" />
@ </form><br/>
db_prepare(&q,
"SELECT name,"
" mperm,"
" (SELECT uuid FROM blob WHERE rid=mlink.pid),"
" (SELECT uuid FROM blob WHERE rid=mlink.fid),"
" (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
" FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
|
| ︙ | ︙ | |||
993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 |
@ <blockquote><p>
object_description(v1, 1, 0);
@ </p></blockquote>
@ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2>
@ <blockquote><p>
object_description(v2, 1, 0);
@ </p></blockquote>
@ <hr />
@ <blockquote><pre>
@ %h(blob_str(&diff))
@ </pre></blockquote>
blob_reset(&diff);
style_footer();
}
| > > > > > > > | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 |
@ <blockquote><p>
object_description(v1, 1, 0);
@ </p></blockquote>
@ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2>
@ <blockquote><p>
object_description(v2, 1, 0);
@ </p></blockquote>
@ <hr />
@ <form method="get" action="%s(g.zTop)/fdiff">
@ See difference from another version:
@ <input type="text" name="v2"/>
@ <input type="hidden" name="v1" value="%s(zV1)"/>
@ <input type="submit" />
@ </form>
@ <hr />
@ <blockquote><pre>
@ %h(blob_str(&diff))
@ </pre></blockquote>
blob_reset(&diff);
style_footer();
}
|
| ︙ | ︙ |