[dna-commits] DNA SVN: r1491 - trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/scm.

[dna-commits at lists.jboss.org]

Author: spagop
Date: 2009-12-29 17:47:12 -0500 (Tue, 29 Dec 2009)
New Revision: 1491

Modified:
   trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/scm/ScmActionFactory.java
Log:
some write svn access (add file/dir, update file)

Modified: trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/scm/ScmActionFactory.java
===================================================================
--- trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/scm/ScmActionFactory.java	2009-12-29 22:46:45 UTC (rev 1490)
+++ trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/scm/ScmActionFactory.java	2009-12-29 22:47:12 UTC (rev 1491)
@@ -31,6 +31,11 @@
                               String file,
                               byte[] content );
 
+    public ScmAction mergeFile( String rootPath,
+                                 String fileName,
+                                 byte[] oldData,
+                                 byte[] newData );
+
     public ScmAction addDirectory( String root,
                                    String path );