- if($rest =~ /\((\d+).(\d+)(.*)\)/) {
- my $newrev = "$1.$2";
- my $oldminver = $2-1;
- my $oldrev = "$1.$oldminver";
- if(!($1==1 && $2==1)) {
+ if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
+ my $start = $1;
+ my $end = $2;
+ my $other = $3;
+ my $newrev = "$start.$end";
+ my $oldrev;
+ if($end != 1) {
+ my $oldminver = $end-1;
+ $oldrev = "$start.$oldminver";
+ }
+ elsif($start =~ /^((\d+\.)+)(\d+)$/) {
+ $oldrev = $1;
+ # take trailing . off old revision
+ chop $oldrev;
+ }
+ if(defined $oldrev) {