869 |
case T_CHECKOUT: |
case T_CHECKOUT: |
870 |
case T_PATCH: |
case T_PATCH: |
871 |
case T_NEEDS_MERGE: |
case T_NEEDS_MERGE: |
|
case T_CONFLICT: |
|
872 |
case T_REMOVE_ENTRY: |
case T_REMOVE_ENTRY: |
873 |
error (0, 0, "Up-to-date check failed for `%s'", finfo->fullname); |
error (0, 0, "Up-to-date check failed for `%s'", finfo->fullname); |
874 |
freevers_ts (&vers); |
freevers_ts (&vers); |
875 |
return 1; |
return 1; |
876 |
|
case T_CONFLICT: |
877 |
case T_MODIFIED: |
case T_MODIFIED: |
878 |
case T_ADDED: |
case T_ADDED: |
879 |
case T_REMOVED: |
case T_REMOVED: |
911 |
return 1; |
return 1; |
912 |
} |
} |
913 |
} |
} |
914 |
if (status == T_MODIFIED && !force_ci && vers->ts_conflict) |
if (status == T_CONFLICT && !force_ci) |
915 |
{ |
{ |
916 |
/* |
error (0, 0, |
917 |
* We found a "conflict" marker. |
"file `%s' had a conflict and has not been modified", |
918 |
* |
finfo->fullname); |
919 |
* If the timestamp on the file is the same as the |
freevers_ts (&vers); |
920 |
* timestamp stored in the Entries file, we block the commit. |
return 1; |
921 |
*/ |
} |
922 |
if ( file_has_conflict ( finfo, vers->ts_conflict ) ) |
if (status == T_MODIFIED && !force_ci && file_has_markers (finfo)) |
923 |
{ |
{ |
924 |
error (0, 0, |
/* Make this a warning, not an error, because we have |
925 |
"file `%s' had a conflict and has not been modified", |
no way of knowing whether the "conflict indicators" |
926 |
finfo->fullname); |
are really from a conflict or whether they are part |
927 |
freevers_ts (&vers); |
of the document itself (cvs.texinfo and sanity.sh in |
928 |
return 1; |
CVS itself, for example, tend to want to have strings |
929 |
} |
like ">>>>>>>" at the start of a line). Making people |
930 |
|
kludge this the way they need to kludge keyword |
931 |
if (file_has_markers (finfo)) |
expansion seems undesirable. And it is worse than |
932 |
{ |
keyword expansion, because there is no -ko |
933 |
/* Make this a warning, not an error, because we have |
analogue. */ |
934 |
no way of knowing whether the "conflict indicators" |
error (0, 0, |
935 |
are really from a conflict or whether they are part |
"\ |
|
of the document itself (cvs.texinfo and sanity.sh in |
|
|
CVS itself, for example, tend to want to have strings |
|
|
like ">>>>>>>" at the start of a line). Making people |
|
|
kludge this the way they need to kludge keyword |
|
|
expansion seems undesirable. And it is worse than |
|
|
keyword expansion, because there is no -ko |
|
|
analogue. */ |
|
|
error (0, 0, |
|
|
"\ |
|
936 |
warning: file `%s' seems to still contain conflict indicators", |
warning: file `%s' seems to still contain conflict indicators", |
937 |
finfo->fullname); |
finfo->fullname); |
|
} |
|
938 |
} |
} |
939 |
|
|
940 |
if (status == T_REMOVED) |
if (status == T_REMOVED) |