[EMAIL PROTECTED] wrote: > > Nicholas Catanchin <[EMAIL PROTECTED]> wrote: > > [...] > > You might get conflicts on the second import, but - whether it conflicts > > or not - you need to merge the two revisions together using: > > > cvs co -jolder_revision -jnewer_revision (-ko) module > > > That command merges differences between the older and newer revision - > > adding and removing files as required. [...] > > Can I do this backwards? If I suddenly discover an even older version > than the ones already imported, is there a simple way to add it in? > I've no idea how the version numbering would cope, but it would save me > some work if it were easy...
No, CVS always thinks that a newly imported version is more recent than any previous import, so the result would delete newer code from the trunk. If you really want to reconstruct your version history in CVS then you'd have to re-do all the imports from scratch in a different repo directory, which isn't really possible on a live repository which is being worked on. - Andrew -- Perfection is reached, not when there is no longer anything to add, but when there is no longer anything to take away. - Antoine de Saint-Exupery _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
