Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
3af6cf099301ba7058ce3cc9068b6010 |
| User & Date: | drh 2010-11-13 23:23:38.000 |
Context
|
2010-11-13
| ||
| 23:29 | Disable automatic pull of shun records for the time being. check-in: 3c2500c765 user: drh tags: trunk | |
| 23:23 | Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort. check-in: 3af6cf0993 user: drh tags: trunk | |
| 12:48 | On a "tree checksum does not match repository" error on a commit, go back and do a file-by-file comparison of the repository and the working checkout to try to discover what the problem is. Ticket [a483f0ab3f0d4da0]. check-in: 64459dd091 user: drh tags: trunk | |
Changes
Changes to src/update.c.
| ︙ | ︙ | |||
111 112 113 114 115 116 117 |
fossil_fatal("Multiple descendants");
}
tid = db_int(0, "SELECT rid FROM leaves, event"
" WHERE event.objid=leaves.rid"
" ORDER BY event.mtime DESC");
}
| < | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 |
fossil_fatal("Multiple descendants");
}
tid = db_int(0, "SELECT rid FROM leaves, event"
" WHERE event.objid=leaves.rid"
" ORDER BY event.mtime DESC");
}
if( !verboseFlag && (tid==vid)) return; /* Nothing to update */
db_begin_transaction();
vfile_check_signature(vid, 1);
if( !nochangeFlag ) undo_begin();
load_vfile_from_rid(tid);
/*
|
| ︙ | ︙ | |||
284 285 286 287 288 289 290 291 292 293 294 295 296 297 |
}else{
printf("UNCHANGED %s\n", zName);
}
}
free(zFullPath);
}
db_finalize(&q);
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( nochangeFlag ){
db_end_transaction(1); /* With --nochange, rollback changes */
}else{
| > > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 |
}else{
printf("UNCHANGED %s\n", zName);
}
}
free(zFullPath);
}
db_finalize(&q);
printf("--------------\n");
show_common_info(tid, "updated-to:", 1, 0);
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( nochangeFlag ){
db_end_transaction(1); /* With --nochange, rollback changes */
}else{
|
| ︙ | ︙ |