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 [7ba95769c4]:

• File src/branch.c — part of check-in [70849e7641] at 2019-09-04 08:32:00 on branch private-branches — Update the 'branch new' command to track the status of private branches in the PRIVATE table, instead of using +private tags. (user: florian size: 22604)

142
143
144
145
146
147
148
149
150
151
152
153
154
155
156

  if( isPrivate && zColor==0 ) zColor = "#fec084";
  if( zColor!=0 ){
    blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
  }
  blob_appendf(&branch, "T *branch * %F\n", zBranch);
  blob_appendf(&branch, "T *sym-%F *\n", zBranch);
  if( isPrivate ){
    blob_appendf(&branch, "T +private *\n");
    noSign = 1;
  }

  /* Cancel all other symbolic tags */
  db_prepare(&q,
      "SELECT tagname FROM tagxref, tag"
      " WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"

<

142
143
144
145
146
147
148

149
150
151
152
153
154
155

  if( isPrivate && zColor==0 ) zColor = "#fec084";
  if( zColor!=0 ){
    blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
  }
  blob_appendf(&branch, "T *branch * %F\n", zBranch);
  blob_appendf(&branch, "T *sym-%F *\n", zBranch);
  if( isPrivate ){

    noSign = 1;
  }

  /* Cancel all other symbolic tags */
  db_prepare(&q,
      "SELECT tagname FROM tagxref, tag"
      " WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"