Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch no-initial-commit Excluding Merge-Ins
This is equivalent to a diff from 14aea4f883 to 0d8cb8e30a
|
2014-07-27
| ||
| 23:18 | Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] check-in: c6c05c82fd user: jan.nijtmans tags: trunk | |
| 20:52 | Proposed fix for corner-case: [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266] Closed-Leaf check-in: 0d8cb8e30a user: jan.nijtmans tags: no-initial-commit | |
| 19:15 | Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17346] check-in: 14aea4f883 user: jan.nijtmans tags: trunk | |
| 18:33 | Fix [http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/17313] check-in: dcb6076572 user: jan.nijtmans tags: trunk | |
Changes to src/descendants.c.
| ︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 |
}
}
db_finalize(&ins);
db_finalize(&isBr);
db_finalize(&q1);
bag_clear(&pending);
bag_clear(&seen);
}
if( closeMode==1 ){
db_multi_exec(
"DELETE FROM leaves WHERE rid IN"
" (SELECT leaves.rid FROM leaves, tagxref"
" WHERE tagxref.rid=leaves.rid "
" AND tagxref.tagid=%d"
| > > > > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 |
}
}
db_finalize(&ins);
db_finalize(&isBr);
db_finalize(&q1);
bag_clear(&pending);
bag_clear(&seen);
}else{
db_multi_exec(
"INSERT INTO leaves"
" SELECT leaf.rid FROM leaf"
);
}
if( closeMode==1 ){
db_multi_exec(
"DELETE FROM leaves WHERE rid IN"
" (SELECT leaves.rid FROM leaves, tagxref"
" WHERE tagxref.rid=leaves.rid "
" AND tagxref.tagid=%d"
|
| ︙ | ︙ |
Changes to src/update.c.
| ︙ | ︙ | |||
259 260 261 262 263 264 265 |
" FROM vfile WHERE vid=%d",
vid
);
/* Compute file name changes on V->T. Record name changes in files that
** have changed locally.
*/
| > | | | | | | | | | | | > | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 |
" FROM vfile WHERE vid=%d",
vid
);
/* Compute file name changes on V->T. Record name changes in files that
** have changed locally.
*/
if( vid ){
find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
if( nChng ){
for(i=0; i<nChng; i++){
db_multi_exec(
"UPDATE fv"
" SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
" WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
aChng[i*2+1], aChng[i*2]
);
}
fossil_free(aChng);
}
}
/* Add files found in the target version T but missing from the current
** version V.
*/
db_multi_exec(
"INSERT OR IGNORE INTO fv(fn,fnt,idv,idt,ridv,ridt,isexe,chnged)"
|
| ︙ | ︙ |