Re: conflict on added files

[Paul Edwards]

"Paul Edwards" <kerravon@nosppaam.w3.to> wrote in message 
news:tSyEa.321$IW4.4095@news-server.bigpond.net.au...

Diffs against cvs1-11-6...

Index: ChangeLog
===================================================================
RCS file: /development/repository/ccvs/ChangeLog,v
retrieving revision 1.1.1.7
diff -c -r1.1.1.7 ChangeLog
*** ChangeLog   27 May 2003 10:00:06 -0000      1.1.1.7
--- ChangeLog   10 Jun 2003 11:56:16 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-06-10  Paul Edwards
+
+       * update.c: make added files show up as a conflict
+       * sanity.sh: added conflict-1
+
  2003-05-25  Derek Price  <derek@ximbiot.com>

        * configure.in: Update CVS version to 1.11.6.
Index: src/sanity.sh
===================================================================
RCS file: /development/repository/ccvs/src/sanity.sh,v
retrieving revision 1.1.1.6
diff -c -r1.1.1.6 sanity.sh
*** src/sanity.sh       27 May 2003 10:04:20 -0000      1.1.1.6
--- src/sanity.sh       10 Jun 2003 11:54:27 -0000
***************
*** 3890,3895 ****
--- 3890,3922 ----
                rm -rf ${CVSROOT_DIRNAME}/first-dir
                ;;

+     conflict)
+         # Test Conflict
+         mkdir ${CVSROOT_DIRNAME}/aaa
+         ${testcvs} checkout aaa >/dev/null 2>&1
+         cd aaa
+         echo aaa >one.c
+         ${testcvs} add one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         rm one.c
+         ${testcvs} remove one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} update -j 1.2 -j 1.1 one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} tag -r 1.2 tag1 one.c >/dev/null 2>&1
+         ${testcvs} tag -r 1.3 tag2 one.c >/dev/null 2>&1
+         echo bbb >>one.c
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} update -j tag1 -j tag2 one.c >/dev/null 2>&1
+
+         dotest_fail conflict-1 "${testcvs} commit -m test one.c" \
+ "${PROG} [a-z]*: Up-to-date check failed for .one.c'
+ ${PROG} \[[a-z]* aborted\]: correct above errors first!"
+         cd ..
+         rm -fr aaa
+         rm -fr ${CVSROOT_DIRNAME}/aaa
+         ;;
+
        rdiff)
                # Test rdiff
                # XXX for now this is just the most essential test...
Index: src/update.c
===================================================================
RCS file: /development/repository/ccvs/src/update.c,v
retrieving revision 1.1.1.6
diff -c -r1.1.1.6 update.c
*** src/update.c        27 May 2003 10:03:40 -0000      1.1.1.6
--- src/update.c        10 Jun 2003 11:16:11 -0000
***************
*** 2322,2327 ****
--- 2322,2329 ----
         between rev1 and rev2.  */
      if (rev1 == NULL || RCS_isdead (vers->srcfile, rev1))
      {
+         char *filestamp;
+
        if (rev1 != NULL)
            free (rev1);
        free (rev2);
***************
*** 2365,2370 ****
--- 2367,2378 ----
            error (0, 0,
                   "file %s exists, but has been added in revision %s",
                   finfo->fullname, jrev2);
+
+         filestamp = time_stamp (finfo->file);
+         /* Mark this file as a conflict */
+         Register (finfo->entries, finfo->file, jrev2, vers->ts_rcs,
+                   vers->options, vers->tag, vers->date, filestamp);
+         free (filestamp);

        return;
      }