Yecch, I forgot pasting from Eclipse into Entourage is a line-ending
disaster. Here's that sample program better formatted:
import org.tigris.subversion.javahl.ClientException;
import org.tigris.subversion.javahl.Revision;
import org.tigris.subversion.javahl.SVNClient;
public class JavaHlTry {
public static void main(String[] args) throws Exception {
try { merge1(); } catch (Exception e) { e.printStackTrace(); }
try { merge2(); } catch (Exception e) { e.printStackTrace(); }
}
private static void merge1() throws ClientException {
SVNClient client = new SVNClient();
client.merge("svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/
aslack/hashedFilters",
Revision.getInstance(9941),
"svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/aslack/hashed
Filters",
Revision.HEAD,
"/Users/jay/rmg/appdev/Core",
false,
true,
false,
true);
}
private static void merge2() throws ClientException {
SVNClient client = new SVNClient();
client.merge("svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/
aslack/hashedFilters",
Revision.HEAD,
Revision.getInstance(9941),
Revision.HEAD,
"/Users/jay/rmg/appdev/Core",
false,
true,
false,
true);
}
}
Received on Wed Oct 4 15:56:11 2006