Fossil

Check-in [97040d6436]
Login

Check-in [97040d6436]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:After a sync, report "Sync finished" in stead of "Pull finished"
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 97040d643693f4825ab634a62e7c93603babfb1b
User & Date: jan.nijtmans 2013-05-23 10:13:26.384
Context
2013-05-23
22:36
Fix problems with update and merge when case-sensitive is off and two different checkouts each add files that differ only in case. ... (check-in: a5a8d0477a user: drh tags: trunk)
10:13
After a sync, report "Sync finished" in stead of "Pull finished" ... (check-in: 97040d6436 user: jan.nijtmans tags: trunk)
2013-05-21
13:56
Add option -v|--verbose to "fossil ls" as replacement for (deprecated) -l. ... (check-in: e91d65afe5 user: jan.nijtmans tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/xfer.c.
︙︙
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391

    nCardSent++;
    /* TBD: Request all transferable configuration values */
    content_enable_dephantomize(0);
    zOpType = "Clone";
  }else if( syncFlags & SYNC_PULL ){
    blob_appendf(&send, "pull %s %s\n", zSCode, zPCode);
    nCardSent++;
    zOpType = "Pull";
  }
  if( syncFlags & SYNC_PUSH ){
    blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
    nCardSent++;
    if( (syncFlags & SYNC_PULL)==0 ) zOpType = "Push";
  }
  manifest_crosslink_begin();








|








1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391

    nCardSent++;
    /* TBD: Request all transferable configuration values */
    content_enable_dephantomize(0);
    zOpType = "Clone";
  }else if( syncFlags & SYNC_PULL ){
    blob_appendf(&send, "pull %s %s\n", zSCode, zPCode);
    nCardSent++;
    zOpType = (syncFlags & SYNC_PUSH)?"Sync":"Pull";
  }
  if( syncFlags & SYNC_PUSH ){
    blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
    nCardSent++;
    if( (syncFlags & SYNC_PULL)==0 ) zOpType = "Push";
  }
  manifest_crosslink_begin();
︙︙