On Fri, Oct 22, 2004 at 03:18:59AM +0300, Giorgos Keramidas wrote: > Step 2) seems weird. It's probably because of the `branch: 1.1.1;' line > in the RCS header of the complete.c,v file. Has this been added > manually to force complete.c back into the vendor branch? As I already mention, there was some CVS surgery happens before to return files to the vendor branch, which was backed out later by peter, but apparently still hits. > modifies it, a conflict might not show up but a cvs update -j VENDOR and > a subsequent commit might still be required to pull up changes from the > vendor branch into HEAD. Some of those changes might not conflict with Of course, I do cvs update -j VENDOR, but its merge is equal to conflicts shown, i.e. single file readline.h -- Andrey Chernov | http://ache.pp.ru/Received on Thu Oct 21 2004 - 22:27:40 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:38:19 UTC