version 1.100, 2006/05/31 07:21:25 |
version 1.101, 2006/05/31 22:24:12 |
|
|
strlcat(diffargs, " -N", sizeof(diffargs)); |
strlcat(diffargs, " -N", sizeof(diffargs)); |
Nflag = 1; |
Nflag = 1; |
break; |
break; |
|
case 'p': |
|
strlcat(diffargs, " -p", sizeof(diffargs)); |
|
diff_pflag = 1; |
|
break; |
case 'r': |
case 'r': |
if (rev1 == NULL) { |
if (rev1 == NULL) { |
rev1 = optarg; |
rev1 = optarg; |
|
|
|
|
cvs_diffreg(p1, p2, NULL); |
cvs_diffreg(p1, p2, NULL); |
cvs_worklist_run(&temp_files, cvs_worklist_unlink); |
cvs_worklist_run(&temp_files, cvs_worklist_unlink); |
|
|
|
if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev) |
|
rcsnum_free(diff_rev1); |
|
if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev) |
|
rcsnum_free(diff_rev2); |
|
|
diff_rev1 = diff_rev2 = NULL; |
diff_rev1 = diff_rev2 = NULL; |
} |
} |