I've been trying to work out a solution to this problem for awhile:
We are working on this product that we received from a vendor (version
2.3), the product was good, but we made some changes. Now the vendor has
finally released v 2.4, and we noticed 90% of our changes have been
implemented.
So what we want to do is import the vendors v2.4, and NOT merge our
changes with it.
There are a lot of files that have been added, deleted and changed. So
we'd rather switch to the vendors 2.4, and add the few changes they
didn't put it.
So far in all my tests/experiments, the vendors changes are merged with
ours, which causes massive ammounts of conflicts/etc.
Does anyone know of an easy way to do this? (Other than starting a new
repository and loosing all of our history).
Thanks,
Nick
ps. Oh and if anyone is interested, we modified CVS to use PAM for
authentication instead of the /etc/passwd file. The patch is rough, but
it works. If anyone wants it, let me know.
--
Nick Clifford
M2 Technology Ltd
Phone +64 9 444 8307 ext 260
Fax +64 9 444 8315
Email [EMAIL PROTECTED]
Web http://www.m2tech.co.nz/
