Fossil

Check-in [1d54dce4]
Login

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

Overview
Comment:Fix indentation in update.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | symlinks
Files: files | file ages | folders
SHA1:1d54dce41e1455f00f2f5b601b81cd0dffd37dae
User & Date: dmitry 2011-09-01 23:44:25
Original Comment: Fix identation in update.c.
Context
2011-09-01
23:55
Change a couple of unlink()'s to file_delete(). check-in: 61d49d92 user: dmitry tags: symlinks
23:44
Fix indentation in update.c. check-in: 1d54dce4 user: dmitry tags: symlinks
23:18
Merge latest changes from trunk. check-in: 2b1a4797 user: dmitry tags: symlinks
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
...
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435

    blob_zero(&sql);
    blob_append(&sql, "DELETE FROM fv WHERE ", -1);
    zSep = "";
    for(i=3; i<g.argc; i++){
      file_tree_name(g.argv[i], &treename, 1);
      if( file_isdir(g.argv[i])==1 ){
	if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
          blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename);
        }else{
          blob_reset(&sql);
          break;
        }
      }else{
        blob_appendf(&sql, "%sfn<>%B ", zSep, &treename);
................................................................................
      int rc;
      if( nameChng ){
        fossil_print("MERGE %s -> %s\n", zName, zNewName);
      }else{
        fossil_print("MERGE %s\n", zName);
      }
      if( islinkv || islinkt /* || file_islink(zFullPath) */ ){
        //if( !nochangeFlag ) blob_write_to_file(&t, zFullNewPath);
        fossil_print("***** Cannot merge symlink %s\n", zNewName);
        nConflict++;        
      }else{
	undo_save(zName);
	content_get(ridt, &t);
	content_get(ridv, &v);
	rc = merge_3way(&v, zFullPath, &t, &r);
	if( rc>=0 ){
	  if( !nochangeFlag ){
	    blob_write_to_file(&r, zFullNewPath);
	    file_setexe(zFullNewPath, isexe);
	  }
	  if( rc>0 ){
	    fossil_print("***** %d merge conflicts in %s\n", rc, zNewName);
	    nConflict++;
	  }
	}else{
	  if( !nochangeFlag ){
	    blob_write_to_file(&t, zFullNewPath);
	    file_setexe(zFullNewPath, isexe);
	  }
	  fossil_print("***** Cannot merge binary file %s\n", zNewName);
	  nConflict++;
	}
      }
      if( nameChng && !nochangeFlag ) file_delete(zFullPath);
      blob_reset(&v);
      blob_reset(&t);
      blob_reset(&r);
    }else{
      if( chnged ){







|







 







<



|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|







301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
...
397
398
399
400
401
402
403

404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434

    blob_zero(&sql);
    blob_append(&sql, "DELETE FROM fv WHERE ", -1);
    zSep = "";
    for(i=3; i<g.argc; i++){
      file_tree_name(g.argv[i], &treename, 1);
      if( file_isdir(g.argv[i])==1 ){
        if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
          blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename);
        }else{
          blob_reset(&sql);
          break;
        }
      }else{
        blob_appendf(&sql, "%sfn<>%B ", zSep, &treename);
................................................................................
      int rc;
      if( nameChng ){
        fossil_print("MERGE %s -> %s\n", zName, zNewName);
      }else{
        fossil_print("MERGE %s\n", zName);
      }
      if( islinkv || islinkt /* || file_islink(zFullPath) */ ){

        fossil_print("***** Cannot merge symlink %s\n", zNewName);
        nConflict++;        
      }else{
        undo_save(zName);
        content_get(ridt, &t);
        content_get(ridv, &v);
        rc = merge_3way(&v, zFullPath, &t, &r);
        if( rc>=0 ){
          if( !nochangeFlag ){
            blob_write_to_file(&r, zFullNewPath);
            file_setexe(zFullNewPath, isexe);
          }
          if( rc>0 ){
            fossil_print("***** %d merge conflicts in %s\n", rc, zNewName);
            nConflict++;
          }
        }else{
          if( !nochangeFlag ){
            blob_write_to_file(&t, zFullNewPath);
            file_setexe(zFullNewPath, isexe);
          }
          fossil_print("***** Cannot merge binary file %s\n", zNewName);
          nConflict++;
        }
      }
      if( nameChng && !nochangeFlag ) file_delete(zFullPath);
      blob_reset(&v);
      blob_reset(&t);
      blob_reset(&r);
    }else{
      if( chnged ){