Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | stash-gdiff-improvement |
| Files: | files | file ages | folders |
| SHA1: | 5e19d731760685a4e4a1591d6275137d79b98943 |
| User & Date: | mgagnon 2017-03-03 19:29:22 |
Context
|
2017-03-03
| ||
| 19:33 | Improve stash diff commands when using external diff tool to make it behave a little bit more like the "fossil gdiff" command. check-in: 2a47673a user: mgagnon tags: trunk | |
| 19:29 | merge trunk Closed-Leaf check-in: 5e19d731 user: mgagnon tags: stash-gdiff-improvement | |
| 16:26 | Fix a bug that prevented clients from pushing SHA3 content up to servers. check-in: 9413c773 user: drh tags: trunk | |
| 14:31 | Add gshow and gcat command to allow to use gdiff-command when diffing the stash against baseline. When using gdiff, call external tool directly with the file from the checkout, it's usefull when merging change manually using the external tool. check-in: 06b16752 user: mgagnon tags: stash-gdiff-improvement | |
Changes
Changes to src/xfer.c.
1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 |
transport_stats(0, 0, 1);
socket_global_init();
memset(&xfer, 0, sizeof(xfer));
xfer.pIn = &recv;
xfer.pOut = &send;
xfer.mxSend = db_get_int("max-upload", 250000);
xfer.maxTime = -1;
if( syncFlags & SYNC_PRIVATE ){
g.perm.Private = 1;
xfer.syncPrivate = 1;
}
blobarray_zero(xfer.aToken, count(xfer.aToken));
blob_zero(&send);
|
> |
1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 |
transport_stats(0, 0, 1);
socket_global_init();
memset(&xfer, 0, sizeof(xfer));
xfer.pIn = &recv;
xfer.pOut = &send;
xfer.mxSend = db_get_int("max-upload", 250000);
xfer.maxTime = -1;
xfer.clientVersion = RELEASE_VERSION_NUMBER;
if( syncFlags & SYNC_PRIVATE ){
g.perm.Private = 1;
xfer.syncPrivate = 1;
}
blobarray_zero(xfer.aToken, count(xfer.aToken));
blob_zero(&send);
|