Fossil

Check-in [fe7f6f3c]
Login

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

Overview
Comment:Another "fork" -> "ambigeous branch" change
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sync-forkwarn
Files: files | file ages | folders
SHA1: fe7f6f3cc19953deb434fb7705be309d87b44973
User & Date: jan.nijtmans 2015-04-26 17:26:14
Context
2015-04-27
14:39
Minor spelling correction. check-in: 76cd08ba user: andybradford tags: sync-forkwarn
2015-04-26
17:26
Another "fork" -> "ambigeous branch" change check-in: fe7f6f3c user: jan.nijtmans tags: sync-forkwarn
17:12
Combine "fossil forks" with "fossil info" command check-in: 4359bd8d user: jan.nijtmans tags: sync-forkwarn
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/descendants.c.

427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
      z = mprintf("%s [%S] %s", zDate, zId, zCom);
      comment_print(z, zCom, 7, width, g.comFmtFlags);
      fossil_free(z);
    }
  }
  fossil_free(zLastBr);
  db_finalize(&q);
  if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branches found ***\n");
}

/*
** WEBPAGE:  leaves
**
** Find leaves of all branches.
*/







|







427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
      z = mprintf("%s [%S] %s", zDate, zId, zCom);
      comment_print(z, zCom, 7, width, g.comFmtFlags);
      fossil_free(z);
    }
  }
  fossil_free(zLastBr);
  db_finalize(&q);
  if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n");
}

/*
** WEBPAGE:  leaves
**
** Find leaves of all branches.
*/

Changes to src/update.c.

560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
      fossil_warning("WARNING: %d unmanaged files were overwritten",
                     nOverwrite);
    }
    if( nMerge ){
      fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
    }
    if( isFork ){
      fossil_warning("WARNING: fork detected, please do a \"fossil merge\"");
    }
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( dryRunFlag ){







|







560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
      fossil_warning("WARNING: %d unmanaged files were overwritten",
                     nOverwrite);
    }
    if( nMerge ){
      fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
    }
    if( isFork ){
      fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\"");
    }
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  if( dryRunFlag ){