geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <ja...@planet57.com>
Subject Re: [jira] Commented: (GERONIMO-2161) [RTC] Remove Geronimo modules from dependencyManagement in root pom.xml
Date Mon, 03 Jul 2006 08:25:24 GMT
Hrm... so I tried something else...

I just svn up'd to get my working copy to revision 418706.  Then svn  
status to make sure there are no conflicts... I've only got M and A  
indicators.

Then `svn diff > test.patch` from trunk, and then in a clean checkout  
`patch -p0 --dry-run < ../../trunk/test.patch`.

Below is the output... notice that it fails on packaging bits too.

Why on earth would this happen?  Either... I have made/applied the  
patches incorrectly, or svn diff is busted, or patch is busted, or  
somehow my workspace is now corrupt... how?!?!  I hope it is not the  
latter else I just wasted several days worth of work to get this  
patch put together.

WTF is going on?!

I checked some of the rejects and most are harmless... but regardless  
of that I am really concerned about the reliability of patches.

:-(

<snip>
patching file applications/ldap-realm-demo/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/console/console-standard/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/console/console-ear/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/console/console-core/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/console/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/console/console-framework/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/magicGball/magicGball-ejb/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/magicGball/magicGball-ear/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/magicGball/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/magicGball/magicGball-web/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/magicGball/magicGball-client/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/demo/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/remote-deploy/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/uddi-db/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/uddi-server/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file applications/welcome/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file configs/unavailable-client-deployer/pom.xml
patching file configs/welcome-tomcat/pom.xml
patching file configs/client-security/pom.xml
patching file configs/javamail/pom.xml
patching file configs/console-tomcat/pom.xml
patching file configs/tomcat/pom.xml
patching file configs/j2ee-server/pom.xml
patching file configs/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file configs/activemq-broker/pom.xml
patching file configs/jsp-examples-tomcat/pom.xml
patching file configs/sharedlib/pom.xml
patching file configs/jetty/pom.xml
patching file configs/console-jetty/pom.xml
patching file configs/client-system/pom.xml
patching file configs/unavailable-ejb-deployer/pom.xml
patching file configs/openejb-deployer/pom.xml
patching file configs/directory/pom.xml
patching file configs/online-deployer/pom.xml
patching file configs/jsp-examples-jetty/pom.xml
patching file configs/j2ee-deployer/pom.xml
patching file configs/tomcat-deployer/pom.xml
patching file configs/activemq/pom.xml
patching file configs/geronimo-gbean-deployer/pom.xml
patching file configs/hot-deployer/pom.xml
patching file configs/shutdown/pom.xml
patching file configs/jetty-deployer/pom.xml
patching file configs/servlets-examples-jetty/pom.xml
patching file configs/openejb/pom.xml
patching file configs/unavailable-webservices-deployer/pom.xml
patching file configs/axis-deployer/pom.xml
patching file configs/system-database/pom.xml
patching file configs/ldap-demo-tomcat/pom.xml
patching file configs/upgrade/pom.xml
patching file configs/welcome-jetty/pom.xml
patching file configs/j2ee-security/pom.xml
patching file configs/upgrade-cli/pom.xml
patching file configs/rmi-naming/pom.xml
patching file configs/ldap-demo-jetty/pom.xml
patching file configs/client-deployer/pom.xml
patching file configs/client-corba/pom.xml
patching file configs/axis/pom.xml
patching file configs/j2ee-system/pom.xml
patching file configs/servlets-examples-tomcat/pom.xml
patching file configs/j2ee-corba/pom.xml
patching file configs/ldap-realm/pom.xml
patching file configs/client/pom.xml
patching file pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file m2-plugins/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- saving rejects to file m2-plugins/geronimo- 
packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ 
PackageBuilderShellMojo.java.rej
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/PlanProcessorMojo.java
Hunk #1 FAILED at 14.
1 out of 5 hunks FAILED -- saving rejects to file m2-plugins/geronimo- 
packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ 
PlanProcessorMojo.java.rej
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/PackageBuilder.java
Hunk #2 succeeded at 52 with fuzz 2.
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/ConfigCopier.java
Hunk #1 FAILED at 34.
1 out of 8 hunks FAILED -- saving rejects to file m2-plugins/geronimo- 
packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ 
ConfigCopier.java.rej
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/MavenAttributeStore.java
Hunk #2 succeeded at 35 with fuzz 2.
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/MavenConfigStore.java
Hunk #2 succeeded at 39 with fuzz 2.
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/PackagingCommandLine.java
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/ConfigCopierMojo.java
Hunk #1 FAILED at 31.
1 out of 3 hunks FAILED -- saving rejects to file m2-plugins/geronimo- 
packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ 
ConfigCopierMojo.java.rej
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
apache/geronimo/plugin/packaging/AbstractDistributor.java
Hunk #2 succeeded at 25 with fuzz 2.
patching file m2-plugins/geronimo-packaging-plugin/src/resources/META- 
INF/plexus/components.xml
patching file m2-plugins/geronimo-packaging-plugin/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file build
patching file build.bat
patching file modules/jmx-remoting/pom.xml
patching file modules/deployment/pom.xml
patching file modules/jetty-builder/pom.xml
patching file modules/activemq-gbean/pom.xml
patching file modules/system/pom.xml
patching file modules/j2ee/pom.xml
patching file modules/tomcat/pom.xml
patching file modules/core/pom.xml
patching file modules/test-ddbean/pom.xml
patching file modules/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file modules/naming-builder/pom.xml
patching file modules/jetty/pom.xml
patching file modules/web-builder/pom.xml
patching file modules/directory/pom.xml
patching file modules/converter/pom.xml
patching file modules/deploy-tool/pom.xml
patching file modules/deploy-jsr88/pom.xml
patching file modules/connector-builder/pom.xml
patching file modules/timer/pom.xml
patching file modules/mail/pom.xml
patching file modules/hot-deploy/pom.xml
patching file modules/service-builder/pom.xml
patching file modules/transaction/pom.xml
patching file modules/upgrade/pom.xml
patching file modules/common/pom.xml
patching file modules/axis-builder/pom.xml
patching file modules/connector/pom.xml
patching file modules/security-builder/pom.xml
patching file modules/activemq-gbean-management/pom.xml
patching file modules/client-builder/pom.xml
patching file modules/axis/pom.xml
Hunk #1 succeeded at 17 with fuzz 2.
patching file modules/derby/pom.xml
patching file modules/j2ee-builder/pom.xml
patching file modules/tomcat-builder/pom.xml
patching file modules/management/pom.xml
patching file modules/client/pom.xml
</snip>

Versions of stuff (on OS X):

<snip>
svn --version
svn, version 1.3.1 (r19032)
    compiled Apr  4 2006, 00:30:54

Copyright (C) 2000-2006 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http:// 
www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV)  
protocol.
   - handles 'http' scheme
   - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network  
protocol.
   - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
   - handles 'file' scheme
</snip>

<snip>
patch --version
patch 2.5.8
Copyright (C) 1988 Larry Wall
Copyright (C) 2002 Free Software Foundation, Inc.

This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.

written by Larry Wall and Paul Eggert
</snip>

On Jul 3, 2006, at 1:10 AM, Jason Dillon wrote:

> Odd... I generated the patch in the same way I did for v1.
>
> I just tried:
>
>     svn co https://svn.apache.org/repos/asf/geronimo/trunk
>     cd trunk
>     patch -p0 < ~/Downloads/GERONIMO-2161-v2.patch.txt
>
> Below is the output of patch...
>
> and I'm a touch concerned since I don't get why it would fail to  
> apply this patch.
>
> I generated the file with:
>
>     svn diff > GERONIMO-2161-v2.patch.txt
>
> Is that not the correct method to generate the patch file?   Or is  
> svn diff + patch not reliable?
>
> I don't get it.
>
> --jason
>
>
> <snip>
> patching file pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> Hunk #2 FAILED at 33.
> 1 out of 2 hunks FAILED -- saving rejects to file pom.xml.rej
> patching file pom.xml
> Reversed (or previously applied) patch detected!  Assume -R? [n] ^C
> Bliss:~/ws/apache/geronimo/tmp/trunk jason$ patch -p0 < ~/Downloads/ 
> GERONIMO-2161-v2.patch.txt
> patching file applications/ldap-realm-demo/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/console/console-standard/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/console/console-ear/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/console/console-core/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/console/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/console/console-framework/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/magicGball/magicGball-ejb/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/magicGball/magicGball-ear/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/magicGball/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/magicGball/magicGball-web/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/magicGball/magicGball-client/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/demo/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/remote-deploy/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/uddi-db/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/uddi-server/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file applications/welcome/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file configs/unavailable-client-deployer/pom.xml
> patching file configs/welcome-tomcat/pom.xml
> patching file configs/client-security/pom.xml
> patching file configs/javamail/pom.xml
> patching file configs/console-tomcat/pom.xml
> patching file configs/tomcat/pom.xml
> patching file configs/j2ee-server/pom.xml
> patching file configs/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file configs/activemq-broker/pom.xml
> patching file configs/jsp-examples-tomcat/pom.xml
> patching file configs/sharedlib/pom.xml
> patching file configs/jetty/pom.xml
> patching file configs/console-jetty/pom.xml
> patching file configs/client-system/pom.xml
> patching file configs/unavailable-ejb-deployer/pom.xml
> patching file configs/openejb-deployer/pom.xml
> patching file configs/directory/pom.xml
> patching file configs/online-deployer/pom.xml
> patching file configs/jsp-examples-jetty/pom.xml
> patching file configs/j2ee-deployer/pom.xml
> patching file configs/tomcat-deployer/pom.xml
> patching file configs/activemq/pom.xml
> patching file configs/geronimo-gbean-deployer/pom.xml
> patching file configs/hot-deployer/pom.xml
> patching file configs/shutdown/pom.xml
> patching file configs/jetty-deployer/pom.xml
> patching file configs/servlets-examples-jetty/pom.xml
> patching file configs/openejb/pom.xml
> patching file configs/unavailable-webservices-deployer/pom.xml
> patching file configs/axis-deployer/pom.xml
> patching file configs/system-database/pom.xml
> patching file configs/ldap-demo-tomcat/pom.xml
> patching file configs/upgrade/pom.xml
> patching file configs/welcome-jetty/pom.xml
> patching file configs/j2ee-security/pom.xml
> patching file configs/upgrade-cli/pom.xml
> patching file configs/rmi-naming/pom.xml
> patching file configs/ldap-demo-jetty/pom.xml
> patching file configs/client-deployer/pom.xml
> patching file configs/client-corba/pom.xml
> patching file configs/axis/pom.xml
> patching file configs/j2ee-system/pom.xml
> patching file configs/servlets-examples-tomcat/pom.xml
> patching file configs/j2ee-corba/pom.xml
> patching file configs/ldap-realm/pom.xml
> patching file configs/client/pom.xml
> patching file pom.xml
> Hunk #1 FAILED at 17.
> Hunk #2 succeeded at 49 (offset 4 lines).
> Hunk #3 succeeded at 537 (offset 4 lines).
> Hunk #4 succeeded at 551 (offset 4 lines).
> Hunk #5 succeeded at 576 (offset 4 lines).
> Hunk #6 succeeded at 596 (offset 4 lines).
> Hunk #7 succeeded at 689 (offset 4 lines).
> Hunk #8 succeeded at 874 (offset 4 lines).
> 1 out of 8 hunks FAILED -- saving rejects to file pom.xml.rej
> patching file m2-plugins/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
> Hunk #2 FAILED at 38.
> 1 out of 2 hunks FAILED -- saving rejects to file m2-plugins/ 
> geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/ 
> packaging/PackageBuilderShellMojo.java.rej
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/PlanProcessorMojo.java
> Hunk #2 FAILED at 50.
> 1 out of 6 hunks FAILED -- saving rejects to file m2-plugins/ 
> geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/ 
> packaging/PlanProcessorMojo.java.rej
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/PackageBuilder.java
> Hunk #2 succeeded at 52 with fuzz 2.
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/ConfigCopier.java
> Hunk #1 FAILED at 34.
> 1 out of 8 hunks FAILED -- saving rejects to file m2-plugins/ 
> geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/ 
> packaging/ConfigCopier.java.rej
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/MavenAttributeStore.java
> Hunk #2 succeeded at 35 with fuzz 2.
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/MavenConfigStore.java
> Hunk #2 succeeded at 39 with fuzz 2.
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/PackagingCommandLine.java
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/ConfigCopierMojo.java
> Hunk #1 FAILED at 35.
> 1 out of 3 hunks FAILED -- saving rejects to file m2-plugins/ 
> geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/ 
> packaging/ConfigCopierMojo.java.rej
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
> patching file m2-plugins/geronimo-packaging-plugin/src/java/org/ 
> apache/geronimo/plugin/packaging/AbstractDistributor.java
> patching file m2-plugins/geronimo-packaging-plugin/src/resources/ 
> META-INF/plexus/components.xml
> patching file m2-plugins/geronimo-packaging-plugin/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file build
> patching file build.bat
> patching file modules/jmx-remoting/pom.xml
> patching file modules/deployment/pom.xml
> patching file modules/jetty-builder/pom.xml
> patching file modules/activemq-gbean/pom.xml
> patching file modules/system/pom.xml
> patching file modules/j2ee/pom.xml
> patching file modules/tomcat/pom.xml
> patching file modules/core/pom.xml
> patching file modules/test-ddbean/pom.xml
> patching file modules/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file modules/naming-builder/pom.xml
> patching file modules/jetty/pom.xml
> patching file modules/web-builder/pom.xml
> patching file modules/directory/pom.xml
> patching file modules/converter/pom.xml
> patching file modules/deploy-tool/pom.xml
> patching file modules/deploy-jsr88/pom.xml
> patching file modules/connector-builder/pom.xml
> patching file modules/timer/pom.xml
> patching file modules/mail/pom.xml
> patching file modules/hot-deploy/pom.xml
> patching file modules/service-builder/pom.xml
> patching file modules/transaction/pom.xml
> patching file modules/upgrade/pom.xml
> patching file modules/common/pom.xml
> patching file modules/axis-builder/pom.xml
> patching file modules/connector/pom.xml
> patching file modules/security-builder/pom.xml
> patching file modules/activemq-gbean-management/pom.xml
> patching file modules/client-builder/pom.xml
> patching file modules/axis/pom.xml
> Hunk #1 succeeded at 17 with fuzz 2.
> patching file modules/derby/pom.xml
> patching file modules/j2ee-builder/pom.xml
> patching file modules/tomcat-builder/pom.xml
> patching file modules/management/pom.xml
> patching file modules/client/pom.xml
> </snip>
>
> --jason
>
>
> On Jul 3, 2006, at 12:45 AM, David Jencks (JIRA) wrote:
>
>>     [ http://issues.apache.org/jira/browse/GERONIMO-2161? 
>> page=comments#action_12418915 ]
>>
>> David Jencks commented on GERONIMO-2161:
>> ----------------------------------------
>>
>> The v2 patch does not apply cleanly to my clean tree.  Will try to  
>> investigate further tomorrow.  All problems are in the packaging  
>> plugin.


Mime
View raw message