Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge in the latest changes from venks-emacs. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
7d2d1d3228232b1a1434e425f11008c0 |
| User & Date: | drh 2010-11-09 17:51:35.000 |
Context
|
2010-11-09
| ||
| 18:15 | Partial implementation of the "fossil import" command. It is incomplete and does not work. check-in: ba837f5e88 user: drh tags: trunk | |
| 17:51 | Merge in the latest changes from venks-emacs. check-in: 7d2d1d3228 user: drh tags: trunk | |
| 17:37 | Merge with trunk check-in: 96c0c68a86 user: venkat tags: venks-emacs | |
| 13:52 | Make "init" an alias for "new". check-in: 21880ca1b6 user: drh tags: trunk | |
Changes
Changes to src/update.c.
| ︙ | ︙ | |||
69 70 71 72 73 74 75 |
nochangeFlag = find_option("nochange","n",0)!=0;
verboseFlag = find_option("verbose","v",0)!=0;
db_must_be_within_tree();
vid = db_lget_int("checkout", 0);
if( vid==0 ){
fossil_fatal("cannot find current version");
}
| | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 |
nochangeFlag = find_option("nochange","n",0)!=0;
verboseFlag = find_option("verbose","v",0)!=0;
db_must_be_within_tree();
vid = db_lget_int("checkout", 0);
if( vid==0 ){
fossil_fatal("cannot find current version");
}
if( !nochangeFlag && db_exists("SELECT 1 FROM vmerge") ){
fossil_fatal("cannot update an uncommitted merge");
}
if( !nochangeFlag ) autosync(AUTOSYNC_PULL);
if( g.argc>=3 ){
if( strcmp(g.argv[2], "current")==0 ){
/* If VERSION is "current", then use the same algorithm to find the
|
| ︙ | ︙ | |||
181 182 183 184 185 186 187 |
blob_zero(&sql);
blob_append(&sql, "DELETE FROM fv WHERE ", -1);
zSep = "";
for(i=3; i<g.argc; i++){
file_tree_name(g.argv[i], &treename, 1);
if( file_isdir(g.argv[i])==1 ){
| | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 |
blob_zero(&sql);
blob_append(&sql, "DELETE FROM fv WHERE ", -1);
zSep = "";
for(i=3; i<g.argc; i++){
file_tree_name(g.argv[i], &treename, 1);
if( file_isdir(g.argv[i])==1 ){
if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename);
}else{
blob_reset(&sql);
break;
}
}else{
blob_appendf(&sql, "%sfn<>%B ", zSep, &treename);
|
| ︙ | ︙ |