[Top][All Lists]

[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 09:30:51 GMT

"Paul Edwards" <kerravon@nosppaam.w3.to> wrote in message 
Index: update.c
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision
diff -r1.202.4.4 update.c
>         char *filestamp;
>         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);

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.

BFN.  Paul.

reply via email to

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