Differences From:
File
src/checkin.c
part of check-in
[a21806dcf3]
- Fixed omitsign discrepancies. Windows version now looks for USERNAME instead of USER when creating new database.
by
jnc on
2007-10-07 14:38:54.
[view]
To:
File
src/checkin.c
part of check-in
[371dd6574c]
- Fix the revert command so that it works from subdirectories. Other
minor comment and help-text changes.
by
drh on
2007-12-04 01:26:21.
Also file
src/checkin.c
part of check-in
[d0305b305a]
- Merged mainline into my branch to get the newest application.
by
aku on
2007-12-05 08:07:46.
[view]
@@ -45,10 +45,13 @@
const char *zPathname = db_column_text(&q,0);
int isDeleted = db_column_int(&q, 1);
int isChnged = db_column_int(&q,2);
int isNew = db_column_int(&q,3)==0;
+ char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname);
blob_append(report, zPrefix, nPrefix);
- if( isNew ){
+ if( access(zFullName, 0) ){
+ blob_appendf(report, "MISSING %s\n", zPathname);
+ }else if( isNew ){
blob_appendf(report, "ADDED %s\n", zPathname);
}else if( isDeleted ){
blob_appendf(report, "DELETED %s\n", zPathname);
}else if( isChnged==2 ){
@@ -57,8 +60,9 @@
blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname);
}else{
blob_appendf(report, "EDITED %s\n", zPathname);
}
+ free(zFullName);
}
db_finalize(&q);
db_prepare(&q, "SELECT uuid FROM vmerge JOIN blob ON merge=rid"
" WHERE id=0");