E&S CVS Commit: PEAK - Added 'ConflictManager' class, for managing settings in included files.

[pje at eby-sarna.com]

Module Name:	PEAK
Committed By:	pje
Date:		Sat Oct 23 17:29:32 UTC 2004

Modified Files:
	PEAK/src/peak/util/tests: __init__.py
Added Files:
	PEAK/src/peak/util: ConflictManager.py
	PEAK/src/peak/util/tests: test_conflict.py

Log Message:
Added 'ConflictManager' class, for managing settings in included files.
It ensures that a setting is set at most once per file, that settings in
an including file override those in included files, and that a setting
set in more than one included file must have a setting in the including
file to disambiguate the two.


To view diffs of this commit, you can use the following URL(s):
http://cvs.eby-sarna.com/PEAK/src/peak/util/ConflictManager.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.eby-sarna.com/PEAK/src/peak/util/tests/__init__.py.diff?r1=1.15&r2=1.16
http://cvs.eby-sarna.com/PEAK/src/peak/util/tests/test_conflict.py?rev=1.1&content-type=text/vnd.viewcvs-markup

To generate a diff of this commit:
cvs rdiff -r0 -r1.1 PEAK/src/peak/util/ConflictManager.py
cvs rdiff -r1.15 -r1.16 PEAK/src/peak/util/tests/__init__.py
cvs rdiff -r0 -r1.1 PEAK/src/peak/util/tests/test_conflict.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.