E&S CVS Commit: PEAK - Views in an extending sitemap now override those in the included sitemap,

[pje at eby-sarna.com]

Module Name:	PEAK
Committed By:	pje
Date:		Sat Oct 23 23:11:27 UTC 2004

Modified Files:
	PEAK/src/peak/web: sitemaps.py
	PEAK/src/peak/web/tests: test_sitemap.py

Log Message:
Views in an extending sitemap now override those in the included sitemap,
instead of causing conflicts.  Conflicting view definitions in the *same*
sitemap will now give a somewhat clearer error message.


To view diffs of this commit, you can use the following URL(s):
http://cvs.eby-sarna.com/PEAK/src/peak/web/sitemaps.py.diff?r1=1.9&r2=1.10
http://cvs.eby-sarna.com/PEAK/src/peak/web/tests/test_sitemap.py.diff?r1=1.9&r2=1.10

To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 PEAK/src/peak/web/sitemaps.py
cvs rdiff -r1.9 -r1.10 PEAK/src/peak/web/tests/test_sitemap.py

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