Differences From Artifact [fac4e85cf1]:

• File src/branch.c — part of check-in [dcd8f1d8f4] at 2019-08-27 01:47:06 on branch vdiff-improvements — Add the "merge-in:NAME" name type, similar to "root:NAME" except that it finds the youngest anscestor of NAME that is in the branch from which the branch of NAME derived. (user: drh size: 22649) [more...]

To Artifact [b60502e7da]:

• File src/branch.c — part of check-in [3ad81c3c49] at 2019-09-03 20:22:33 on branch trunk — Make calls to db_begin_write() instead of db_begin_transaction() where appropriate. (user: drh size: 22643) [more...]

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

        " WHERE tagtype>0"
        "   AND tagid=(SELECT tagid FROM tag WHERE tagname='sym-%q')",
        zBranch)!=0 ){
    fossil_fatal("branch \"%s\" already exists", zBranch);
  }

  user_select();
  db_begin_transaction();
  rootid = name_to_typed_rid(g.argv[4], "ci");
  if( rootid==0 ){
    fossil_fatal("unable to locate check-in off of which to branch");
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST, 0);
  if( pParent==0 ){

|

93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

        " WHERE tagtype>0"
        "   AND tagid=(SELECT tagid FROM tag WHERE tagname='sym-%q')",
        zBranch)!=0 ){
    fossil_fatal("branch \"%s\" already exists", zBranch);
  }

  user_select();
  db_begin_write();
  rootid = name_to_typed_rid(g.argv[4], "ci");
  if( rootid==0 ){
    fossil_fatal("unable to locate check-in off of which to branch");
  }

  pParent = manifest_get(rootid, CFTYPE_MANIFEST, 0);
  if( pParent==0 ){