Jeff, Are you saying that creating and applying a patch file will break SVN history?
Lawrence "Jeff MAURY" <[EMAIL PROTECTED]> Sent by: [EMAIL PROTECTED] 06/24/2008 05:12 PM Please respond to [email protected] To [email protected] cc Subject Refactoring: I'm stuck with subversion Hello, I started the refactoring but I'm facing the following issue: it seems that the svn diff command is not useful if you've done deletes and moves inside your working copy. It seems to keep track of modifications on existing files, event the concept of file deletion is badly implemented (the file becomes empty). As an example, I moved pom.xml from trunk/java to trunk and woden-api (which contains only pom.xml) from trunk/java to trunk. Please find the resulting diff: Index: trunk/java/woden-api/pom.xml =================================================================== --- trunk/java/woden-api/pom.xml (revision 671231) +++ trunk/java/woden-api/pom.xml (working copy) @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ! - ! Licensed to the Apache Software Foundation (ASF) under one or more - ! contributor license agreements. See the NOTICE file distributed with - ! this work for additional information regarding copyright ownership. - ! The ASF licenses this file to You under the Apache License, Version 2.0 - ! (the "License"); you may not use this file except in compliance with - ! the License. You may obtain a copy of the License at - ! - ! http://www.apache.org/licenses/LICENSE-2.0 - ! - ! Unless required by applicable law or agreed to in writing, software - ! distributed under the License is distributed on an "AS IS" BASIS, - ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ! See the License for the specific language governing permissions and - ! limitations under the License. - !--> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.woden</groupId> - <artifactId>woden</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - - <artifactId>woden-api</artifactId> - <name>Woden - API</name> - - <build> - <sourceDirectory>../src</sourceDirectory> - <resources> - <resource> - <directory>../src</directory> - <excludes> - <exclude>**/internal/**</exclude> - <exclude>**/tool/converter/**</exclude> - <exclude>org/apache/woden/ant/**</exclude> - <exclude>javax/xml/namespace/**</exclude> - <exclude>**/*.java</exclude> - </excludes> - </resource> - <resource> - <targetPath>META-INF</targetPath> - <directory>../</directory> - <includes> - <include>LICENSE</include> - <include>README</include> - <include>NOTICE</include> - </includes> - </resource> - <resource> - <targetPath>META-INF</targetPath> - <directory>../resources</directory> - <includes> - <include>schema.catalog</include> - </includes> - </resource> - </resources> - - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/internal/**</exclude> - <exclude>**/tool/converter/**</exclude> - <exclude>org/apache/woden/ant/**</exclude> - <exclude>javax/xml/namespace/**</exclude> - </excludes> - <source>1.4</source> - <target>1.4</target> - <compilerArgument>-g</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-one-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>install-maven-one-repository</goal> - <goal>deploy-maven-one-repository</goal> - </goals> - </execution> - </executions> - <configuration> - <remoteRepositoryId>apache</remoteRepositoryId> - <remoteRepositoryUrl> - scpexe:// people.apache.org/www/people.apache.org/repo/m1-snapshot-repository - </remoteRepositoryUrl> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file Index: trunk/java/pom.xml =================================================================== --- trunk/java/pom.xml (revision 671231) +++ trunk/java/pom.xml (working copy) @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ! - ! Licensed to the Apache Software Foundation (ASF) under one or more - ! contributor license agreements. See the NOTICE file distributed with - ! this work for additional information regarding copyright ownership. - ! The ASF licenses this file to You under the Apache License, Version 2.0 - ! (the "License"); you may not use this file except in compliance with - ! the License. You may obtain a copy of the License at - ! - ! http://www.apache.org/licenses/LICENSE-2.0 - ! - ! Unless required by applicable law or agreed to in writing, software - ! distributed under the License is distributed on an "AS IS" BASIS, - ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ! See the License for the specific language governing permissions and - ! limitations under the License. - !--> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.woden</groupId> - <artifactId>woden</artifactId> - <version>1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <inceptionYear>2005</inceptionYear> - <name>Woden</name> - <description>The Woden project is a subproject of the Apache Web Services Project to - develop a Java class library for reading, manipulating, creating and writing WSDL documents, - initially to support WSDL 2.0 but with the longer term aim of supporting past, present and - future versions of WSDL. - - There are two main deliverables: an API and an implementation. The Woden API consists of - a set of Java interfaces. The WSDL 2.0-specific portion of the Woden API conforms to the - W3C WSDL 2.0 specification. The implementation will be a high performance implementation - directly usable in other Apache projects such as Axis2. - </description> - <url>http://ws.apache.org/woden/</url> - <scm> - <connection>scm:svn: http://svn.apache.org/repos/asf/webservices/woden/trunk/java/</connection> - <developerConnection>scm:svn: https://svn.apache.org/repos/asf/webservices/woden/trunk/java/ </developerConnection> - <url>http://svn.apache.org/viewvc/webservices/woden/trunk/java/</url> - </scm> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>org.apache.woden.resolver.logging</name> - <value>off</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.0.0</version> - </plugin> - </plugins> - </reporting> - <mailingLists> - <mailingList> - <name>Woden Developers</name> - <subscribe>[EMAIL PROTECTED]</subscribe> - <unsubscribe>[EMAIL PROTECTED]</unsubscribe> - <archive>http://mail-archives.apache.org/mod_mbox/ws-woden-dev/ </archive> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>woden-cvs</name> - <subscribe>[EMAIL PROTECTED]</subscribe> - <unsubscribe>[EMAIL PROTECTED] </unsubscribe> - </mailingList> - </mailingLists> - <issueManagement> - <system>jira</system> - <url>http://issues.apache.org/jira/browse/Woden</url> - </issueManagement> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <dependencies> - <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - <version>SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.2</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>2.6.0</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.4</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${bundle.plugin.version}</version> - <configuration> - <instructions> - <Bundle-Version>${woden.osgi.version}</Bundle-Version> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <distributionManagement> - <snapshotRepository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>scpexe:// people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url> - </snapshotRepository> - </distributionManagement> - <modules> - <module>woden-dom</module> - <module>woden-om</module> - <module>woden-api</module> - </modules> - <properties> - <woden.osgi.version>1.0.0</woden.osgi.version> - <bundle.plugin.version>1.4.0</bundle.plugin.version> - </properties> -</project> Given the large quantity of refactoring that I'm going to do, I'm afraid we will loose a large quantity of work. So what solution should I use ? I could send a zipped copy of my working trunk, I have check it is about 2,2Mo or do you have any ideas ? Regards Jeff MAURY -- La mélancolie c'est communiste Tout le monde y a droit de temps en temps La mélancolie n'est pas capitaliste C'est même gratuit pour les perdants La mélancolie c'est pacifiste On ne lui rentre jamais dedans La mélancolie oh tu sais ça existe Elle se prend même avec des gants La mélancolie c'est pour les syndicalistes Il faut juste sa carte de permanent Miossec (2006) http://www.jeffmaury.com http://riadiscuss.jeffmaury.com http://www.lastfm.fr/listen/user/jeffmaury/personal --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
