Fossil: Check-in [e1f614f3]

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

Overview

Comment:	Style consistency change only.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| sync-forkwarn
Files:	files \| file ages \| folders
SHA1:	e1f614f3b82a07e37ba21fbbb3581de1d3ca90f1
User & Date:	andybradford 2015-04-22 16:32:42

Context

2015-04-22
19:10		Remove unused variable check-in: 101fdfe8 user: jan.nijtmans tags: sync-forkwarn
16:32		Style consistency change only. check-in: e1f614f3 user: andybradford tags: sync-forkwarn
05:21		Only check for forks in newly received content after all round-trips of sync have completed. check-in: b9728c4a user: andybradford tags: sync-forkwarn

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

  Stmt q;
  int fForkSeen = 0;

  blob_zero(&sql);
  blob_append_sql(&sql,
    "  SELECT blob.rid FROM blob"
    "    JOIN leaf ON blob.rid=leaf.rid"
    "   WHERE rcvid = %d" 
    " AND NOT %z", rcvid, leaf_is_closed_sql("leaf.rid"));
  db_prepare(&q, "%s", blob_sql_text(&sql));
  blob_reset(&sql);
  while( !fForkSeen && db_step(&q)==SQLITE_ROW ){
    int rid = db_column_int(&q, 0);
    fForkSeen = fossil_find_nearest_fork(rid, db_open_local(0))!=0;
  }

  Stmt q;
  int fForkSeen = 0;

  blob_zero(&sql);
  blob_append_sql(&sql,
    "  SELECT blob.rid FROM blob"
    "    JOIN leaf ON blob.rid=leaf.rid"
    "   WHERE rcvid=%d" 
    " AND NOT %z", rcvid, leaf_is_closed_sql("leaf.rid"));
  db_prepare(&q, "%s", blob_sql_text(&sql));
  blob_reset(&sql);
  while( !fForkSeen && db_step(&q)==SQLITE_ROW ){
    int rid = db_column_int(&q, 0);
    fForkSeen = fossil_find_nearest_fork(rid, db_open_local(0))!=0;
  }