Differences From Artifact [3ce44214ed]:

• File src/sync.c — part of check-in [817d795f96] at 2013-11-02 17:26:45 on branch url-password-fixes — Restore URL flags because user_select() causes them to be altered. This allows the save password prompt to appear when required. (user: andybradford size: 8583)

To Artifact [5af0ddd702]:

• File src/sync.c — part of check-in [23e51b9d9b] at 2013-11-04 15:12:22 on branch url-password-fixes — Preserve any URL flags that get added when parsing the original URL. (user: andybradford size: 8608)

117
118
119
120
121
122
123

124
125
126
127
128
129
130

    clone_ssh_db_set_options();
  }
  url_parse(zUrl, urlFlags);
  if( g.urlProtocol==0 ){
    if( urlOptional ) fossil_exit(0);
    usage("URL");
  }

  user_select();
  g.urlFlags = urlFlags;
  if( g.argc==2 ){
    if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
      fossil_print("Sync with %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PUSH ){
      fossil_print("Push to %s\n", g.urlCanonical);

>

117
118
119
120
121
122
123
124
125
126
127
128
129
130
131

    clone_ssh_db_set_options();
  }
  url_parse(zUrl, urlFlags);
  if( g.urlProtocol==0 ){
    if( urlOptional ) fossil_exit(0);
    usage("URL");
  }
  urlFlags = g.urlFlags;
  user_select();
  g.urlFlags = urlFlags;
  if( g.argc==2 ){
    if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
      fossil_print("Sync with %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PUSH ){
      fossil_print("Push to %s\n", g.urlCanonical);