[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/subr.c
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/subr.c |
Date: |
Thu, 22 Sep 2005 23:19:34 -0400 |
Index: ccvs/src/subr.c
diff -u ccvs/src/subr.c:1.146 ccvs/src/subr.c:1.147
--- ccvs/src/subr.c:1.146 Tue Sep 6 04:55:09 2005
+++ ccvs/src/subr.c Fri Sep 23 03:19:24 2005
@@ -573,55 +573,6 @@
-/*
- * file_has_conflict
- *
- * This function compares the timestamp of a file with ts_conflict set
- * to the timestamp on the actual file and returns TRUE or FALSE based
- * on the results.
- *
- * This function does not check for actual markers in the file and
- * file_has_markers() function should be called when that is interesting.
- *
- * ASSUMPTIONS
- * The ts_conflict field is not NULL.
- *
- * RETURNS
- * TRUE ts_conflict matches the current timestamp.
- * FALSE The ts_conflict field does not match the file's
- * timestamp.
- */
-int
-file_has_conflict (const struct file_info *finfo, const char *ts_conflict)
-{
- char *filestamp;
- int retcode;
-
- /* If ts_conflict is NULL, there was no merge since the last
- * commit and there can be no conflict.
- */
- assert (ts_conflict);
-
- /*
- * If the timestamp has changed and no
- * conflict indicators are found, it isn't a
- * conflict any more.
- */
-
- if (server_active)
- retcode = ts_conflict[0] == '=' && ts_conflict[1] == '\0';
- else
- {
- filestamp = time_stamp (finfo->file);
- retcode = !strcmp (ts_conflict, filestamp);
- free (filestamp);
- }
-
- return retcode;
-}
-
-
-
/* Does the file FINFO contain conflict markers? The whole concept
of looking at the contents of the file to figure out whether there are
unresolved conflicts is kind of bogus (people do want to manage files