|Since I had suffered from partially applied CTM deltas, some time ago,
|I made ctm ignore deltas for files that match the "after edit" MD5. |(In one case, I had the compiler fill all temporary space while CTM |was editing files.) Submitted by: se Reviewed by: phk
This commit is contained in:
parent
515d7c92d3
commit
f6ac6875d7
@ -154,7 +154,12 @@ Pass2(FILE *fd)
|
||||
strcmp(tmp,p)) {
|
||||
fprintf(stderr," %s: %s md5 mismatch.\n",
|
||||
sp->Key,name);
|
||||
if(j & CTM_Q_MD5_Force) {
|
||||
GETFIELDCOPY(md5,sep);
|
||||
if(md5 != NULL && strcmp(tmp,md5) == 0) {
|
||||
fprintf(stderr," %s: %s already applied.\n",
|
||||
sp->Key,name);
|
||||
match = CTM_FILTER_DISABLE;
|
||||
} else if(j & CTM_Q_MD5_Force) {
|
||||
if(Force)
|
||||
fprintf(stderr," Can and will force.\n");
|
||||
else
|
||||
@ -165,9 +170,10 @@ Pass2(FILE *fd)
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
if(j & CTM_Q_MD5_After) {
|
||||
GETFIELDCOPY(md5,sep);
|
||||
} else if(j & CTM_Q_MD5_After) {
|
||||
if(md5 == NULL) {
|
||||
GETFIELDCOPY(md5,sep);
|
||||
}
|
||||
break;
|
||||
}
|
||||
/* Unqualified MD5 */
|
||||
|
Loading…
Reference in New Issue
Block a user