bug-cvs
[Top][All Lists]
Advanced

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

Re: conflict on added files


From: Paul Edwards
Subject: Re: conflict on added files
Date: Fri, 27 Jun 2003 22:55:47 GMT

"Derek Robert Price" <address@hidden> wrote in message news:address@hidden
> >Derek, I've just been going through some old stuff to see what
> >made it in so far, thanks for doing the "rdiff -s" with version
> >number for "removed".  But what is the status of this one?
> >
> >You were concerned that it was easy to get around this conflict
> >by just doing a "touch", but I think it is better to have some
> >sort of safety net rather than none, even if ideally it would
> >reference /dev/null and do a 3-way merge to get conflict
> >markers in the code itself.
>
> Try that again as a universal or context diff and I'll take a look.

Index: update.c
===================================================================
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision 1.202.4.4
diff -c -r1.202.4.4 update.c
*** update.c 28 Apr 2003 18:52:16 -0000 1.202.4.4
--- update.c 27 Jun 2003 22:54:34 -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, mrev, vers->ts_rcs,
+                   vers->options, vers->tag, vers->date, filestamp);
+         free (filestamp);

   return;
      }




reply via email to

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