[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Creating a patch for a new folder

From: Dimuthu Leelarathne <dimuthul_at_wso2.com>
Date: 2007-01-12 05:08:12 CET

Hi again,

In the mail list archive I found something in the below link.

http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=35473
 
It has a para as follows.

"Now the sticking point comes when it the developer is ready send their
changes into the office. Before they do this, it would make sense to merge
their changes into the latest copy of the code as provided by the latest zip
file. My initial idea was for the developer to create a patch of their
working copy, download the latest from the ftp site and apply their patch -
resolving any conflicts as necessary. However, as everyone is no doubt
aware, the major floor here is that file additions/deletion are not catered
for."

Does this mean I cannot create patches to add folders/files ?

Thanks,
Dimuthu

On Fri, 2007-01-12 at 09:26 +0530, Dimuthu Leelarathne wrote:
> Hi All,
>
> I need to create a patch for a new folder named "mtompolicy" and all
> it's content. The folder structure is at the end of the email(Please
> refer [1] at the bottom).
>
> I ran the command "svn add mtompolicy". According to the manual this
> should add all the content recursively.
>
> When I ran the command "svn stat" this is what I could see.
> ? modules/integration/activemq-data
> ? modules/mtompolicy/test
> ? modules/mtompolicy/project.xml
> ? modules/mtompolicy/maven.xml
> ? modules/mtompolicy/src
> ? modules/mtompolicy/test-resources
> A modules/mtompolicy
> M etc/project.properties
>
>
>
> But the problem is when I run "svn diff" the changes cannot be seen. But
> I need to create a patch with all the content in the folder(Please refer
> [1])
>
>
> Index: etc/project.properties
> ===================================================================
> --- etc/project.properties (revision 492431)
> +++ etc/project.properties (working copy)
> @@ -69,6 +69,7 @@
> modules/savan/project.xml,\
> modules/rahas/project.xml,\
> modules/secpolicy/project.xml,\
> +modules/mtompolicy/project.xml,\
> ${optional.includes}
>
> #maven.multiproject.excludes=modules/tool/project.xml
>
>
> Am I doing something wrong? What should I do?
>
> Thanks in advance for any hints.
>
> Thanks,
> Dimuthu.
>
> "WSO2 - Oxygenating the Web Service Platform"
>
> Ref [1]
> .
> |-- maven.xml
> |-- project.xml
> |-- src
> | |-- META-INF
> | | `-- services
> | | `-- org.apache.neethi.builders.AssertionBuilder
> | `-- org
> | `-- apache
> | `-- axis2
> | `-- policy
> | |-- builders
> | | `-- MTOMAssertionBuilder.java
> | `-- model
> | `-- MTOMAssertion.java
> |-- test
> | `-- org
> | `-- apache
> | `-- axis2
> | `-- policy
> | `-- model
> | `-- MTOMAssertionTest.java
> `-- test-resources
> `-- policy-mtom-security.xml
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 12 05:08:24 2007

This is an archived mail posted to the Subversion Users mailing list.