[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: importing vendor branch and removed files
From: |
Larry Jones |
Subject: |
Re: importing vendor branch and removed files |
Date: |
Sat, 13 Mar 2004 21:45:29 -0500 (EST) |
Spiro Trikaliotis writes:
>
> So, this behaviour seems to be by design. Anyway, I ask myself if I can
> do anything about this to change this behaviour?
You need to do the merges, just like the manual says. However, you
shouldn't need to do all the individual merges, it should be sufficient
to just do a single merge between the first revision you imported and
the last revision you imported. That will allow CVS to detect the files
that were removed along the way and mark them as dead. Something like:
cvs co -jstuff-1-1 -jstuff-9-16 stuff
cd stuff
cvs ci -m'merge'
And remember to merge after any future imports.
-Larry Jones
Is it too much to ask for an occasional token gesture of appreciation?!
-- Calvin