idea bouncing: using cvs as a replacement for mergemaster

Garrett Cooper youshi10 at u.washington.edu
Tue Nov 27 19:48:31 PST 2007


On Nov 27, 2007, at 7:45 PM, Aryeh M. Friedman wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I was thinking seeing the fact that I already have a cvs repo of
> - -current does it make sense to just use CVS to update /etc  
> instead of
> mergemaster... if so any ideas on doing it cleanly?
>
> - --
> Aryeh M. Friedman
> Developer, not business, friendly
> http://www.flosoft-systems.com
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.4 (FreeBSD)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFHTORVJ9+1V27SttsRAqcuAJ4sW4ObPrnUi6az4T+NQebCVMbDCQCfUS+i
> gCRv9mwC2mu6B4LAPZ9bW3s=
> =tD/k
> -----END PGP SIGNATURE-----


	CVS sucks and I wouldn't wish that requirement on anyone for their  
base system..
	There isn't a decent idiot-proof / foolproof system out there for  
defeating merging issues...
-Garrett



More information about the freebsd-hackers mailing list