Fossil

Check-in [454658c0]
Login

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

Overview
Comment:merge from trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wolfgangFormat2CSS_2
Files: files | file ages | folders
SHA1:454658c0b0667227b398e244995652ef834e4ea3
User & Date: wolfgang 2010-10-06 09:54:22
Context
2010-10-06
09:54
moved attribute bgcolor to css check-in: 720fa53d user: wolfgang tags: wolfgangFormat2CSS_2
09:54
merge from trunk check-in: 454658c0 user: wolfgang tags: wolfgangFormat2CSS_2
00:12
Change ancestor age check error message to be more precise. Ticket [5e9020fe4ccfc11e94]. check-in: 89d4d0b8 user: drh tags: trunk
2010-10-05
09:43
merged from trunk check-in: def52067 user: wolfgang tags: wolfgangFormat2CSS_2
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
  b = db_exists(
    "SELECT 1 FROM event"
    " WHERE datetime(mtime)>=%Q"
    "   AND type='ci' AND objid=%d",
    zDate, rid
  );
  if( b ){
    fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)"
                 " Use -f to override.", zUuid, zDate);
  }
#endif
}

/*
** zDate should be a valid date string.  Convert this string into the







|







511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
  b = db_exists(
    "SELECT 1 FROM event"
    " WHERE datetime(mtime)>=%Q"
    "   AND type='ci' AND objid=%d",
    zDate, rid
  );
  if( b ){
    fossil_fatal("ancestor check-in [%.10s] (%s) is not older (clock skew?)"
                 " Use -f to override.", zUuid, zDate);
  }
#endif
}

/*
** zDate should be a valid date string.  Convert this string into the