[stellation-res] check core revision misc@@10 - fix Bugzilla 21789, prob

[Dave Shields <shields@xxxxxxxxxxxxxx>]

2002-07-23    <shields@xxxxxxxxxxxxxx>

* core revision main@@10
	
	* src/org/eclipse/stellation/workspace/Merge.java: 
	Fix Bugzilla 21789 so that baseline version updated when merging
	with main branch. Sorting this bug out uncovered a problem
	checking in single-line artifacts, reported as Bugzilla 21819, and
	there are some doubts about some update code, as noted in an added
	comment near end of UpdateProject(), and demonstrated problem in
	repeated merge reported as Bugzilla 21826.
-- 
Dave Shields, IBM Research, shields@xxxxxxxxxxxxxx, http://www.eclipse.org/stellation