/[cvs]/ccvs/src/commit.c
ViewVC logotype

Diff of /ccvs/src/commit.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.254 by scjones, Fri Sep 2 21:51:08 2005 UTC revision 1.255 by dprice, Fri Sep 23 03:19:23 2005 UTC
# Line 845  check_fileproc (void *callerdat, struct Line 845  check_fileproc (void *callerdat, struct
845          case T_CHECKOUT:          case T_CHECKOUT:
846          case T_PATCH:          case T_PATCH:
847          case T_NEEDS_MERGE:          case T_NEEDS_MERGE:
         case T_CONFLICT:  
848          case T_REMOVE_ENTRY:          case T_REMOVE_ENTRY:
849              error (0, 0, "Up-to-date check failed for `%s'", finfo->fullname);              error (0, 0, "Up-to-date check failed for `%s'", finfo->fullname);
850              goto out;              goto out;
851            case T_CONFLICT:
852          case T_MODIFIED:          case T_MODIFIED:
853          case T_ADDED:          case T_ADDED:
854          case T_REMOVED:          case T_REMOVED:
# Line 887  check_fileproc (void *callerdat, struct Line 887  check_fileproc (void *callerdat, struct
887                      goto out;                      goto out;
888                  }                  }
889              }              }
890              if (status == T_MODIFIED && !force_ci && vers->ts_conflict)              if (status == T_CONFLICT && !force_ci)
891              {              {
892                  /*                  error (0, 0,
893                   * We found a "conflict" marker.                        "file `%s' had a conflict and has not been modified",
894                   *                         finfo->fullname);
895                   * If the timestamp on the file is the same as the                  goto out;
896                   * timestamp stored in the Entries file, we block the commit.              }
897                   */              if (status == T_MODIFIED && !force_ci && file_has_markers (finfo))
898                  if (file_has_conflict (finfo, vers->ts_conflict))              {
899                  {                  /* Make this a warning, not an error, because we have
900                      error (0, 0,                     no way of knowing whether the "conflict indicators"
901                            "file `%s' had a conflict and has not been modified",                     are really from a conflict or whether they are part
902                             finfo->fullname);                     of the document itself (cvs.texinfo and sanity.sh in
903                      goto out;                     CVS itself, for example, tend to want to have strings
904                  }                     like ">>>>>>>" at the start of a line).  Making people
905                       kludge this the way they need to kludge keyword
906                  if (file_has_markers (finfo))                     expansion seems undesirable.  And it is worse than
907                  {                     keyword expansion, because there is no -ko
908                      /* Make this a warning, not an error, because we have                     analogue.  */
909                         no way of knowing whether the "conflict indicators"                  error (0, 0,
910                         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,  
                            "\  
911  warning: file `%s' seems to still contain conflict indicators",  warning: file `%s' seems to still contain conflict indicators",
912                             finfo->fullname);                         finfo->fullname);
                 }  
913              }              }
914    
915              if (status == T_REMOVED)              if (status == T_REMOVED)

Legend:
Removed from v.1.254  
changed lines
  Added in v.1.255

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26