[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
conflict on added files
From: |
Paul Edwards |
Subject: |
conflict on added files |
Date: |
Sun, 08 Jun 2003 04:22:49 GMT |
Although ideally when a file has been added from two sources, we would
have a 3-way diff using /dev/null as a base, at least if we can mark the
file as having a conflict, it has a good chance of failsafing...
Index: update.c
===================================================================
RCS file: /cvs/ccvs/src/update.c,v
retrieving revision 1.202.4.4
diff -r1.202.4.4 update.c
2324a2325,2326
> char *filestamp;
>
2367a2370,2375
>
> 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);
- conflict on added files,
Paul Edwards <=
Message not available