Differences From Artifact [e950548383]:
- File src/json_status.c — part of check-in [aeb1cfe112] at 2013-03-06 14:22:58 on branch mistake — merge trunk (committed to wrong branch) (user: jan.nijtmans size: 5280) [more...]
To Artifact [75f3d7432f]:
- File src/json_status.c — part of check-in [b984ecaf1d] at 2013-07-11 08:47:18 on branch merge-integrate — Implement "fossil merge --integrate" as suggested by Harald Oehlmann. The only part missing is the actual closing of the branch. (user: jan.nijtmans size: 5328) [more...]
| ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 166 167 168 | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | + |
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 -3: 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");
|
| ︙ |