cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] Changes to ccvs/src/classify.c


From: Derek Robert Price
Subject: [Cvs-cvs] Changes to ccvs/src/classify.c
Date: Thu, 22 Sep 2005 23:19:26 -0400

Index: ccvs/src/classify.c
diff -u ccvs/src/classify.c:1.35 ccvs/src/classify.c:1.36
--- ccvs/src/classify.c:1.35    Thu Sep 22 05:43:46 2005
+++ ccvs/src/classify.c Fri Sep 23 03:19:22 2005
@@ -284,7 +284,9 @@
                        error (0, 0, "warning: `%s' was lost", finfo->fullname);
                ret = T_CHECKOUT;
            }
-           else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)
+           else if (!strcmp (vers->ts_user,
+                             vers->ts_conflict
+                             ? vers->ts_conflict : vers->ts_rcs))
            {
 
                /*
@@ -298,6 +300,8 @@
                if (vers->entdata->options &&
                    strcmp (vers->entdata->options, vers->options) != 0)
                    ret = T_CHECKOUT;
+               else if (vers->ts_conflict)
+                   ret = T_CONFLICT;
                else
                {
                    sticky_ck (finfo, aflag, vers);
@@ -318,6 +322,13 @@
                else
                    ret = T_NEEDS_MERGE;
 #else
+               /* Files with conflict markers and new timestamps fall through
+                * here, but they need to.  T_CONFLICT is an error in
+                * commit_fileproc, whereas T_CONFLICT with conflict markers
+                * is caught but only warned about.  Similarly, update_fileproc
+                * currently reregisters a file that was conflicted but lost
+                * its markers.
+                */
                ret = T_MODIFIED;
                sticky_ck (finfo, aflag, vers);
 #endif




reply via email to

[Prev in Thread] Current Thread [Next in Thread]