Differences From Artifact [26a1319be8]:

• File src/configure.c — part of check-in [046658848c] at 2011-02-25 17:40:20 on branch trunk — Add the new crnl-glob setting which defines files for which it is OK to have CRNL line endings. Windows projects on which this is preferred can set the crnl-glob pattern to '*'. (user: drh size: 17050)

To Artifact [0dfe397807]:

• File src/configure.c — part of check-in [4a17f85182] at 2011-02-26 21:49:43 on branch private-sync — First cut at code to enable syncing private branches. Code compiles but is otherwise untested. The "x" privilege is required on the server in order to sync privately. (user: drh size: 17054) [more...]

462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478

      zPw = unobscure(db_get("last-sync-pw", 0));
    }
    url_parse(zServer);
    if( g.urlPasswd==0 && zPw ) g.urlPasswd = mprintf("%s", zPw);
    user_select();
    url_enable_proxy("via proxy: ");
    if( strncmp(zMethod, "push", n)==0 ){
      client_sync(0,0,0,0,mask);
    }else{
      client_sync(0,0,0,mask,0);
    }
  }else
  if( strncmp(zMethod, "reset", n)==0 ){
    int mask, i;
    char *zBackup;
    if( g.argc!=4 ) usage("reset AREA");
    mask = find_area(g.argv[3]);

|

|

462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478

      zPw = unobscure(db_get("last-sync-pw", 0));
    }
    url_parse(zServer);
    if( g.urlPasswd==0 && zPw ) g.urlPasswd = mprintf("%s", zPw);
    user_select();
    url_enable_proxy("via proxy: ");
    if( strncmp(zMethod, "push", n)==0 ){
      client_sync(0,0,0,0,0,mask);
    }else{
      client_sync(0,0,0,0,mask,0);
    }
  }else
  if( strncmp(zMethod, "reset", n)==0 ){
    int mask, i;
    char *zBackup;
    if( g.argc!=4 ) usage("reset AREA");
    mask = find_area(g.argv[3]);