Fossil

Differences From Artifact [41ee31fccc]:

• File src/branch.c — part of check-in [1b4516168d] at 2011-02-24 17:11:34 on branch trunk — Infrastructure changes: Simplify content_put() to a single parameter. Add content_put_ex() with lots of extra parameters. Add isPrivate parameters to content_put_ex() and content_new(). (user: drh size: 10745)

To Artifact [151b4fed49]:

• File src/branch.c — part of check-in [448dc5adf7] at 2011-03-16 02:31:40 on branch trunk — Fix the "branch new" command so that it works if the parent omits the R-card. Ticket [3bfff6e03bcc5f14] (user: drh size: 10780)

97
98
99
100
101
102
103

104

105
106
107
108
109
110
111

        blob_appendf(&branch, " %s", pParent->aFile[i].zPerm);
      }
    }
    blob_append(&branch, "\n", 1);
  }
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rootid);
  blob_appendf(&branch, "P %s\n", zUuid);

  blob_appendf(&branch, "R %s\n", pParent->zRepoCksum);

  manifest_destroy(pParent);

  /* Add the symbolic branch name and the "branch" tag to identify
  ** this as a new branch */
  if( zColor!=0 ){
    blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
  }

>
|
>

97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113

        blob_appendf(&branch, " %s", pParent->aFile[i].zPerm);
      }
    }
    blob_append(&branch, "\n", 1);
  }
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rootid);
  blob_appendf(&branch, "P %s\n", zUuid);
  if( pParent->zRepoCksum ){
    blob_appendf(&branch, "R %s\n", pParent->zRepoCksum);
  }
  manifest_destroy(pParent);

  /* Add the symbolic branch name and the "branch" tag to identify
  ** this as a new branch */
  if( zColor!=0 ){
    blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
  }