Fossil

Check-in [82aded4c]
Login

Check-in [82aded4c]

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

Overview
Comment:Fix private content push bug mentioned on Forum. It's possible that this content has already been recorded as private so ignore unique constraint error.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 82aded4cff95dd74078209baabbb68bde9d4a89488e66f41034e3d8c4102cc96
User & Date: andybradford 2019-04-11 14:12:17
Context
2019-04-17
14:50
Applied a fix to fossil-autocomplete.bash posted on the forum, said to avoid adding a space to the end of an autocompleted path: https://fossil-scm.org/forum/forumpost/7ba4a4c495 ... (check-in: 99ad7fc3 user: wyoung tags: trunk)
2019-04-11
14:12
Fix private content push bug mentioned on Forum. It's possible that this content has already been recorded as private so ignore unique constraint error. ... (check-in: 82aded4c user: andybradford tags: trunk)
01:17
Update the built-in SQLite to the first 3.28.0 beta. ... (check-in: cbc21e52 user: drh tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/content.c.

︙︙
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610

    db_exec(&s1);
    rid = db_last_insert_rowid();
    if( !pBlob ){
      db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
    }
  }
  if( g.markPrivate || isPrivate ){
    db_multi_exec("INSERT INTO private VALUES(%d)", rid);
    markAsUnclustered = 0;
  }
  if( nBlob==0 ) blob_reset(&cmpr);

  /* If the srcId is specified, then the data we just added is
  ** really a delta.  Record this fact in the delta table.
  */








|








596
597
598
599
600
601
602
603
604
605
606
607
608
609
610

    db_exec(&s1);
    rid = db_last_insert_rowid();
    if( !pBlob ){
      db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
    }
  }
  if( g.markPrivate || isPrivate ){
    db_multi_exec("INSERT OR IGNORE INTO private VALUES(%d)", rid);
    markAsUnclustered = 0;
  }
  if( nBlob==0 ) blob_reset(&cmpr);

  /* If the srcId is specified, then the data we just added is
  ** really a delta.  Record this fact in the delta table.
  */
︙︙