Hello, SVNKit 1.7.0-alpha1 does not yet support merge operation for the new working copy format yet.
Today we plan to publish 1.7.0-alpha2, unfortunately still without merge support, but the next published build (beta) that we plan to publish in two weeks will include merge support for 1.7 working copy format. Alexander Kitaev, TMate Software, http://subgit.com/ - Svn to Git Migration! http://svnkit.com/ - Java [Sub]Versioning Library! http://hg4j.com/ - Java Mercurial Library! http://sqljet.com/ - Java SQLite Library! On 12 January 2012 07:27, supersha <[email protected]> wrote: > > Hi, > > I use svnkit 1.7. > I want to merge a branch to working copy(working copy is checkouted by > svnkit),code is here: > > SVNURL repositoryURL1 = null; > SVNURL repositoryURL2 = null; > try { > repositoryURL1 = SVNURL.parseURIEncoded("url to > branch"); > repositoryURL2 = SVNURL.parseURIEncoded("url to > branch"); > } catch (SVNException e) {} > > File compFile = new File(local_path); > SVNDiffClient merge = svnClientManager.getDiffClient(); > //merge.doMerge(repositoryURL,SVNRevision.HEAD,compFile,SVNRevision.HEAD,compFile,SVNDepth.INFINITY, > true, false, false, false); > > //merge.doMerge(repositoryURL1,SVNRevision.HEAD,repositoryURL2,SVNRevision.HEAD,compFile,SVNDepth.INFINITY, > true, true, true, true); > merge.doMergeReIntegrate(repositoryURL1, SVNRevision.HEAD, > compFile, > true); > > but when I run the code ,it noted that "The path xxx appears to be part of a > subversion 1.7 or greater working copy, Please upgrade your Subversion > client to use this working copy." > > how to solve this problem? thanks a lot. > > > -- > View this message in context: > http://old.nabble.com/doMerge-doMergeReIntegrate-problem-tp33125930p33125930.html > Sent from the SVNKit - Users mailing list archive at Nabble.com. > >
