Bert Freudenberg uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-bf.494.mcz

==================== Summary ====================

Name: Monticello-bf.494
Author: bf
Time: 24 February 2012, 4:27:52.801 pm
UUID: d27059d4-3f41-43b5-a488-0ac8a0066667
Ancestors: Monticello-bf.493

- fix branch handling in version names
- let MCDiffyVersion handle parsing diffy version names

=============== Diff against Monticello-bf.493 ===============

Item was added:
+ ----- Method: MCVersionDependency>>packageAndBranchName (in category 'accessing') -----
+ packageAndBranchName
+ 	^self versionInfo packageAndBranchName!

Item was added:
+ ----- Method: MCVersionInfo>>packageAndBranchName (in category 'accessing') -----
+ packageAndBranchName
+ 	^ name
+ 		ifNil: [ self name ]
+ 		ifNotNil: [ name asMCVersionName packageAndBranchName ]!

Item was removed:
- ----- Method: MCVersionName>>ancestorAuthor (in category 'accessing') -----
- ancestorAuthor
- 	"The author of the ancestor, if this is a Diffy filename."
- 
- 	^self ancestry copyUpTo: $.!

Item was removed:
- ----- Method: MCVersionName>>ancestorVersionNumber (in category 'accessing') -----
- ancestorVersionNumber
- 	"The author of the ancestor, if this is a Diffy filename."
- 
- 	^(self ancestry copyAfter: $.) asInteger ifNil: [ 0 ]!

Item was added:
+ ----- Method: MCVersionName>>baseVersionName (in category 'accessing') -----
+ baseVersionName
+ 	"The version name of our ancestor, if this is a Diffy filename."
+ 
+ 	^(MCDiffyVersion baseNameFrom: (self copyUpThrough: $))) asMCVersionName!

Item was added:
+ ----- Method: MCVersionName>>packageAndBranchName (in category 'accessing') -----
+ packageAndBranchName
+ 	"The MC package name, possibly with branch name, embedded into this filename."
+ 	
+ 	^self versionName copyUpToLast: $-!

Item was changed:
  ----- Method: MCVersionName>>packageName (in category 'accessing') -----
  packageName
  	"The MC Package name embedded into this filename."
  	
+ 	^self packageAndBranchName copyUpTo: $.!
- 	^self versionName copyUpToLast: $-!

Item was changed:
  ----- Method: MCVersionName>>versionName (in category 'accessing') -----
  versionName
  	"Answer my version name as a ByteString, without the file suffix or any ancestor-attributes."
  	| end |
+ 	self isEmpty ifTrue: [^ String empty]. 
+ 	end := self indexOf: $( ifAbsent: [
+ 		(self last between: $0 and: $9)
+ 			ifTrue: [ self size + 1 ]
+ 			ifFalse: [ self lastIndexOf: $. ifAbsent: [ self size + 1 ] ] ].
+ 	^self first: end - 1!
- 	self isEmpty ifTrue: [^ String empty].  
- 	(self last between: $0 and: $9)
- 		ifTrue: [ end := self size ]
- 		ifFalse: [
- 			end := (self lastIndexOf: $. ifAbsent: [ self size + 1 ]) - 1.
- 			end := end min: (self indexOf: $( ifAbsent: [ self size + 1 ]) - 1 ].
- 	^self first: end!