Re: Resolving conflicts with CVS

2000-04-09 Thread Kris Kennaway
On Sun, 9 Apr 2000, Warner Losh wrote: > The hard part in this is when files leave the tree. cvs import > doesn't cope with that at all well. And don't even get me started on > files that leave the tree and then come back. The problem I was trying to solve was working out in advance what confl

Re: Resolving conflicts with CVS

2000-04-09 Thread Warner Losh
In message <[EMAIL PROTECTED]> Kris Kennaway writes: : setenv CVSROOT /path/to/new/repo : cvs init : cp -rp /home/ncvs/src/whatever /path/to/new/repo/subdir : cvs co whatever : cvs import ... The hard part in this is when files leave the tree. cvs import doesn't cope with that at all well. And