Fossil

Differences From Artifact [807405a4a8]:

• File src/update.c — part of check-in [a51808c0a5] at 2009-11-06 01:59:29 on branch trunk — Work toward improving the "diff" command. Get the "-r" or "--from" option working. (user: drh size: 9957)

To Artifact [74a2862e7d]:

• File src/update.c — part of check-in [6ae51190cc] at 2009-12-10 02:19:16 on branch trunk — reserve the use of brackets in stdout for artifacts (user: rwilson size: 9957)

302
303
304
305
306
307
308
309
310
311
312
313
314
315
316

  zFile = mprintf("%/", g.argv[g.argc-1]);

  file_tree_name(zFile, &fname, 1);

  if( access(zFile, 0) ) yesRevert = 1;  
  if( yesRevert==0 ){
    char *prompt = mprintf("revert file %B? this will"
                           " destroy local changes [y/N]? ",
                           &fname);
    blob_zero(&ans);
    prompt_user(prompt, &ans);
    free( prompt );
    if( blob_str(&ans)[0]=='y' ){
      yesRevert = 1;
    }

|

302
303
304
305
306
307
308
309
310
311
312
313
314
315
316

  zFile = mprintf("%/", g.argv[g.argc-1]);

  file_tree_name(zFile, &fname, 1);

  if( access(zFile, 0) ) yesRevert = 1;  
  if( yesRevert==0 ){
    char *prompt = mprintf("revert file %B? this will"
                           " destroy local changes (y/N)? ",
                           &fname);
    blob_zero(&ans);
    prompt_user(prompt, &ans);
    free( prompt );
    if( blob_str(&ans)[0]=='y' ){
      yesRevert = 1;
    }