Fossil

Check-in [6cd7087a]
Login

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

Overview
Comment:Correct spacing of CHERRYPICK, BACKOUT, and INTEGRATE records in the change/status report to match the other record types. The style is to have a token identifying the record type, spaces padding up to TEN columns if necessary, a single space, then the filename or artifact ID. Previously, these three records padded to ELEVEN, which is inappropriate outside of Spın̈al Tap.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6cd7087a35cb8448031ad72f99439401ce872670
User & Date: andygoth 2015-07-01 01:23:28
Context
2015-07-02
02:35
Add tags to the title and description for RSS feed items. check-in: 66c3bc15 user: mistachkin tags: trunk
2015-07-01
01:23
Correct spacing of CHERRYPICK, BACKOUT, and INTEGRATE records in the change/status report to match the other record types. The style is to have a token identifying the record type, spaces padding up to TEN columns if necessary, a single space, then the filename or artifact ID. Previously, these three records padded to ELEVEN, which is inappropriate outside of Spın̈al Tap. check-in: 6cd7087a user: andygoth tags: trunk
2015-06-30
15:18
Update the built-in SQLite to the latest 3.8.11 alpha version. check-in: 0fc8b9df user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
    free(zFullName);
  }
  blob_reset(&rewrittenPathname);
  db_finalize(&q);
  db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid"
                 " WHERE id<=0");
  while( db_step(&q)==SQLITE_ROW ){
    const char *zLabel = "MERGED_WITH";
    switch( db_column_int(&q, 1) ){
      case -1:  zLabel = "CHERRYPICK ";  break;
      case -2:  zLabel = "BACKOUT    ";  break;
      case -4:  zLabel = "INTEGRATE  ";  break;
    }
    blob_append(report, zPrefix, nPrefix);
    blob_appendf(report, "%s %s\n", zLabel, db_column_text(&q, 0));
  }
  db_finalize(&q);
  if( nErr ){
    fossil_fatal("aborting due to prior errors");
  }
}








|






|







136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
    free(zFullName);
  }
  blob_reset(&rewrittenPathname);
  db_finalize(&q);
  db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid"
                 " WHERE id<=0");
  while( db_step(&q)==SQLITE_ROW ){
    const char *zLabel = "MERGED_WITH ";
    switch( db_column_int(&q, 1) ){
      case -1:  zLabel = "CHERRYPICK ";  break;
      case -2:  zLabel = "BACKOUT    ";  break;
      case -4:  zLabel = "INTEGRATE  ";  break;
    }
    blob_append(report, zPrefix, nPrefix);
    blob_appendf(report, "%s%s\n", zLabel, db_column_text(&q, 0));
  }
  db_finalize(&q);
  if( nErr ){
    fossil_fatal("aborting due to prior errors");
  }
}