Index: src/add.c ================================================================== --- src/add.c +++ src/add.c @@ -214,11 +214,11 @@ "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zFilePath) ){ printf("SKIPPED %s\n", zPath); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); - printf("DELETED %s\n", zPath); + printf("DISMISSED %s\n", zPath); } blob_reset(&pathname); } blob_resize(&path, origSize); } @@ -228,13 +228,15 @@ } /* ** COMMAND: rm ** COMMAND: delete +** COMMAND: dismiss ** ** Usage: %fossil rm FILE... ** or: %fossil delete FILE... +** or: %fossil dismiss FILE... ** ** Remove one or more files from the tree. ** ** This command does not remove the files from disk. It just marks the ** files as no longer being part of the project. In other words, future @@ -264,11 +266,11 @@ if( !db_exists( "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ fossil_fatal("not in the repository: %s", zName); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); - printf("DELETED %s\n", zPath); + printf("DISMISSED %s\n", zPath); } blob_reset(&pathname); } free(zName); } Index: src/checkin.c ================================================================== --- src/checkin.c +++ src/checkin.c @@ -52,11 +52,11 @@ int isNew = db_column_int(&q,3)==0; int isRenamed = db_column_int(&q,4); char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname); blob_append(report, zPrefix, nPrefix); if( isDeleted ){ - blob_appendf(report, "DELETED %s\n", zPathname); + blob_appendf(report, "DISMISSED %s\n", zPathname); }else if( !file_isfile(zFullName) ){ if( access(zFullName, 0)==0 ){ blob_appendf(report, "NOT_A_FILE %s\n", zPathname); if( missingIsFatal ){ fossil_warning("not a file: %s", zPathname); @@ -70,11 +70,11 @@ } } }else if( isNew ){ blob_appendf(report, "ADDED %s\n", zPathname); }else if( isDeleted ){ - blob_appendf(report, "DELETED %s\n", zPathname); + blob_appendf(report, "DISMISSED %s\n", zPathname); }else if( isChnged==2 ){ blob_appendf(report, "UPDATED_BY_MERGE %s\n", zPathname); }else if( isChnged==3 ){ blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname); }else if( isChnged==1 ){ @@ -175,11 +175,11 @@ printf("NOT_A_FILE %s\n", zPathname); }else{ printf("MISSING %s\n", zPathname); } }else if( isDeleted ){ - printf("DELETED %s\n", zPathname); + printf("DISMISSED %s\n", zPathname); }else if( chnged ){ printf("EDITED %s\n", zPathname); }else if( renamed ){ printf("RENAMED %s\n", zPathname); }else{ Index: src/diff.c ================================================================== --- src/diff.c +++ src/diff.c @@ -819,16 +819,16 @@ @ </pre> style_footer(); } /* -** COMMAND: annotate +** COMMAND: annotated ** -** %fossil annotate FILENAME +** %fossil annotated FILENAME ** -** Output the text of a file with markings to show when each line of -** the file was last modified. +** Output annotated text of a file showing when each line of the file +** was last modified. */ void annotate_cmd(void){ int fnid; /* Filename ID */ int fid; /* File instance ID */ int mid; /* Manifest where file was checked in */ Index: src/diffcmd.c ================================================================== --- src/diffcmd.c +++ src/diffcmd.c @@ -237,11 +237,11 @@ int isDeleted = db_column_int(&q, 1); int isChnged = db_column_int(&q,2); int isNew = db_column_int(&q,3); char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname); if( isDeleted ){ - printf("DELETED %s\n", zPathname); + printf("DISMISSED %s\n", zPathname); }else if( access(zFullName, 0) ){ printf("MISSING %s\n", zPathname); }else if( isNew ){ printf("ADDED %s\n", zPathname); }else if( isChnged==3 ){ @@ -310,11 +310,11 @@ cmp = -1; }else{ cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName); } if( cmp<0 ){ - printf("DELETED %s\n", mFrom.aFile[iFrom].zName); + printf("DISMISSED %s\n", mFrom.aFile[iFrom].zName); iFrom++; }else if( cmp>0 ){ printf("ADDED %s\n", mTo.aFile[iTo].zName); iTo++; }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){