Differences From Artifact [3f11f754a6]:

• File src/branch.c — part of check-in [6752934026] at 2010-06-16 20:33:58 on branch trunk — On a branch timeline, in addition to showing the checkins of the branch, also show check-ins of other branches that merge into or from the branch being displayed. This helps to show what has happened to an infrequently changing branch which is part of a much more active project. (user: drh size: 10176) [more...]

To Artifact [ebef8eb082]:

• File src/branch.c — part of check-in [932825bc6a] at 2010-07-08 17:53:14 on branch trunk — Take care to close the connection to the database file before existing. This gives the database a chance to clean up (and, for example, delete WAL and shared-memory files). (user: drh size: 10183) [more...]

127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

  blob_appendf(&branch, "Z %b\n", &mcksum);
  if( !noSign && clearsign(&branch, &branch) ){
    Blob ans;
    blob_zero(&ans);
    prompt_user("unable to sign manifest.  continue (y/N)? ", &ans);
    if( blob_str(&ans)[0]!='y' ){
      db_end_transaction(1);
      exit(1);
    }
  }

  brid = content_put(&branch, 0, 0);
  if( brid==0 ){
    fossil_panic("trouble committing manifest: %s", g.zErrMsg);
  }

|

127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

  blob_appendf(&branch, "Z %b\n", &mcksum);
  if( !noSign && clearsign(&branch, &branch) ){
    Blob ans;
    blob_zero(&ans);
    prompt_user("unable to sign manifest.  continue (y/N)? ", &ans);
    if( blob_str(&ans)[0]!='y' ){
      db_end_transaction(1);
      fossil_exit(1);
    }
  }

  brid = content_put(&branch, 0, 0);
  if( brid==0 ){
    fossil_panic("trouble committing manifest: %s", g.zErrMsg);
  }