*** bin/rename.dist	Mon Mar 31 15:53:47 2003
--- bin/rename	Fri Mar 28 17:17:56 2003
***************
*** 134,139 ****
--- 134,154 ----
      if( $lockFailure ) {
         moreRefsToChange( $oldWeb, $oldTopic, $newWeb, $newTopic, $skin );
         return;
+     } elsif ( "$newWeb" eq "Trash" && "$oldWeb" ne "Trash" ) {
+        #redirect to parent: ending in Trash is not the expected way
+        my $meta = ""; my $text = "";
+        ( $meta, $text ) = &TWiki::Store::readTopic( $newWeb, $newTopic, 1 );
+        my %parent = $meta->findOne( "TOPICPARENT" );
+        if( %parent && $parent{"name"} && $parent{"name"} ne $oldTopic ) {
+ 	 if ( $parent{"name"} =~ /([^.]+)[.]([^.]+)/ ) {
+ 	   $new_url = &TWiki::getViewUrl( $1, $2 );
+ 	 } else {
+ 	   $new_url = &TWiki::getViewUrl( $oldWeb, $parent{"name"} );
+ 	 }
+        } else {
+ 	 use vars qw( $mainTopicname );
+ 	  $new_url = &TWiki::getViewUrl( $oldWeb, $mainTopicname );
+        }
      } else {
         #redirect to new topic
         $new_url = &TWiki::getViewUrl( $newWeb, $newTopic );