[svk-devel] svk mv a b, did not cause b to get removed on svk push

Jason Dillon jason at planet57.com
Sun Mar 18 21:22:27 EDT 2007


I just did a slight refactor using svk2 to rename some modules.  But  
when I pushed them back to the mirror, the old directories did not  
get removed.

Below is the header of the svn commit mail.  I basically did a few  
things like:

     svk mv modules/geronimo-activemq-gbean modules/geronimo-activemq

Then made a few changes to files under modules/geronimo-activemq/*  
and checked that in to my local svk branch.  I did that a few times  
to rename modules, and update sources.

But for some reason when I 'svk push'd these back to the mirror svk  
did not remove the old directories.  I had expected to see under the  
"Removed" section:

     geronimo/server/trunk/modules/geronimo-activemq-gbean
     geronimo/server/trunk/modules/geronimo-activemq-gbean-management

<snip>
Author: jdillon
Date: Sun Mar 18 18:01:01 2007
New Revision: 519774

URL: http://svn.apache.org/viewvc?view=rev&rev=519774
Log:
  r6663 at Bliss:  jason | 2007-03-18 15:28:48 -0700
  Branch for server/trunk re-org
  r6664 at Bliss:  jason | 2007-03-18 15:38:19 -0700
  New parent dir
  r6665 at Bliss:  jason | 2007-03-18 15:41:22 -0700
  new dir
  r6666 at Bliss:  jason | 2007-03-18 15:48:27 -0700
  Repackage amq stuff into org.apache.geronimo.activemq
  r6667 at Bliss:  jason | 2007-03-18 15:57:00 -0700
  Rename geronimo-activemq-gbean* modules to geronimo-activemq*
  r6668 at Bliss:  jason | 2007-03-18 16:00:24 -0700
  Fixing up packages
  r6669 at Bliss:  jason | 2007-03-18 16:03:31 -0700
  Drop gbean package
  r6670 at Bliss:  jason | 2007-03-18 16:52:18 -0700
  Update references to new activemq module names

Added:
     geronimo/server/trunk/modules/geronimo-activemq/
       - copied from r519684, geronimo/server/trunk/modules/geronimo- 
activemq-gbean/
     geronimo/server/trunk/modules/geronimo-activemq-management/
       - copied from r519684, geronimo/server/trunk/modules/geronimo- 
activemq-gbean-management/
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/activemq/
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/activemq/ActiveMQBroker.java   (with  
props)
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/activemq/ActiveMQConnector.java   (with  
props)
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/activemq/ActiveMQManager.java   (with  
props)
     geronimo/server/trunk/modules/geronimo-activemq-management/src/ 
main/java/org/apache/geronimo/activemq/package.html   (with props)
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/BrokerServiceGBean.java   (with props)
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java   (with props)
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/TransportConnectorGBeanImpl.java   (with  
props)
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/management/
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/management/ActiveMQManagerGBean.java    
(with props)
     geronimo/server/trunk/modules/geronimo-activemq/src/main/java/ 
org/apache/geronimo/activemq/package.html   (with props)
     geronimo/server/trunk/modules/geronimo-activemq/src/test/java/ 
org/apache/geronimo/
     geronimo/server/trunk/modules/geronimo-activemq/src/test/java/ 
org/apache/geronimo/activemq/
     geronimo/server/trunk/modules/geronimo-activemq/src/test/java/ 
org/apache/geronimo/activemq/ConnectorTest.java   (with props)
Removed:
     geronimo/server/trunk/modules/geronimo-activemq-gbean-management/
     geronimo/server/trunk/modules/geronimo-activemq-gbean/LICENSE.txt
     geronimo/server/trunk/modules/geronimo-activemq-gbean/NOTICE.txt
     geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/ 
java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/ 
java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/ 
java/org/apache/activemq/gbean/management/
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/ 
java/org/apache/activemq/gbean/package.html
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/site/
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/test/
Modified:
     geronimo/server/trunk/   (props changed)
     geronimo/server/trunk/configs/activemq-broker/pom.xml
     geronimo/server/trunk/configs/activemq-broker/src/plan/plan.xml
     geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
     geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
     geronimo/server/trunk/modules/geronimo-activemq-gbean/src/main/ 
java/org/apache/activemq/gbean/BrokerServiceGBean.java
     geronimo/server/trunk/modules/geronimo-activemq-management/pom.xml
     geronimo/server/trunk/modules/geronimo-activemq/pom.xml
     geronimo/server/trunk/modules/pom.xml
</snip>

But instead, I see parts of geronimo/server/trunk/modules/geronimo- 
activemq-gbean/* being removed and geronimo/server/trunk/modules/ 
geronimo-activemq-gbean-management was not removed at all (or  
anything underneath it).  I actually did 'svk mv' not 'svk cp' these,  
my shell history can confirm this:

<snip>
   721  svk mv geronimo-activemq-gbean geronimo-activemq
   722  svk mv geronimo-activemq-gbean-management geronimo-activemq- 
management
...
   726  svk ci
...
   803  svk push -l
</snip>

Maybe this was because of the '-l' on push?  I wanted to commit all  
of my local changes at once.  I actually hoped I could add some  
additional messages to the commit message too, but guess I can't :-(

Am I misusing svk?  Or maybe... svk2 isnt' really ready for prime  
time?  I hope not... I've got high hopes that svk2 will be my  
savior.  But so far I'm a little bit let down by it... and I'm going  
back to wishing that the ASF was using perforce... :-(

--jason




More information about the svk-devel mailing list