Fossil

Check-in [d1b5fd87]
Login

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

Overview
Comment:Only allow a checkin against a closed leaf if it is not the same branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | pending-review
Files: files | file ages | folders
SHA1:d1b5fd8738e8511f3f36ba7acfbe1679105454db
User & Date: andybradford 2014-07-19 16:29:56
Context
2014-07-19
19:20
Allow commits against a closed leaf as long as the new commit is on a different branch. check-in: 619fa857 user: drh tags: trunk
16:29
Only allow a checkin against a closed leaf if it is not the same branch. Closed-Leaf check-in: d1b5fd87 user: andybradford tags: pending-review
08:34
Update internal tables (used by e.g. the \w and \W specifiers in regexp expressions) to Unicode 7.0. This is fully upwards compatible, see http://www.unicode.org/policies/stability_policy.html check-in: 3088939e user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

1677
1678
1679
1680
1681
1682
1683




1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
  ){
    fossil_fatal("would fork.  \"update\" first or use --allow-fork.");
  }

  /*
  ** Do not allow a commit against a closed leaf on the same branch.
  */




  if( !sCiInfo.zBranch && db_exists("SELECT 1 FROM tagxref"
                " WHERE tagid=%d AND rid=%d AND tagtype>0",
                TAG_CLOSED, vid) ){
    fossil_fatal("cannot commit against a closed leaf");
  }

  if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1);
  if( zComment ){
    blob_zero(&comment);
    blob_append(&comment, zComment, -1);







>
>
>
>
|
|
|







1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
  ){
    fossil_fatal("would fork.  \"update\" first or use --allow-fork.");
  }

  /*
  ** Do not allow a commit against a closed leaf on the same branch.
  */
  if( !( sCiInfo.zBranch &&
         !db_exists("SELECT 1 FROM tagxref"
                    " WHERE tagid=%d AND rid=%d AND tagtype>0"
                    "   AND value=%Q", TAG_BRANCH, vid, sCiInfo.zBranch )
      ) && db_exists("SELECT 1 FROM tagxref"
                     " WHERE tagid=%d AND rid=%d AND tagtype>0",
                     TAG_CLOSED, vid) ){
    fossil_fatal("cannot commit against a closed leaf");
  }

  if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1);
  if( zComment ){
    blob_zero(&comment);
    blob_append(&comment, zComment, -1);