Thanks Alex ..
But looks like beloe code does not return actual differences . it returns
very big list I am using is correctly ???
public List<ReportDetails> CompareEntries(
ISVNAuthenticationManager authManager, String url1, String url2,
boolean recursive) {
SVNDiffClient diffClient = new SVNDiffClient(authManager, null);
final List<ReportDetails> svnLogEntries = new
ArrayList<ReportDetails>();
try {
// Log event handler
ISVNLogEntryHandler handler = new ISVNLogEntryHandler() {
@Override
public void handleLogEntry(SVNLogEntry logEntry)
throws SVNException {
ReportDetails reportDetails = new ReportDetails();
reportDetails.setAuthor(logEntry.getAuthor( ));
System.out.println(
"---------------------------------------------" );
System.out.println ("revision: " +
logEntry.getRevision( ) );
System.out.println( "author: " + logEntry.getAuthor( )
);
if ( logEntry.getChangedPaths(
).size( ) > 0 ) {
ArrayList<String> filenamelist =
new ArrayList<String>();
Set changedPathsSet =
logEntry.getChangedPaths( ).keySet( );
for ( Iterator changedPaths =
changedPathsSet.iterator( ); changedPaths.hasNext( ); ) {
SVNLogEntryPath entryPath =
( SVNLogEntryPath ) logEntry.getChangedPaths( ).get( changedPaths.next( )
);
filenamelist.add(entryPath.getCopyPath());
System.out.println(
entryPath.getPath());
}
reportDetails.setChangedFileName(filenamelist);
}
svnLogEntries.add(reportDetails);
}
};
* diffClient.doGetLogEligibleMergeInfo(SVNHelper.getSVNURL(url1),
SVNRevision.HEAD, SVNHelper.getSVNURL(url2),
SVNRevision.HEAD, true, null, handler);*
} catch (SVNException e) {
e.printStackTrace();
}
return svnLogEntries;
}
On Tue, Jan 29, 2013 at 8:32 AM, Alexander Kitaev-4 [via Subversion] <
ml-node+s1072662n177787...@n5.nabble.com> wrote:
> Hello,
>
> > I would like to create a integration report from 2
> Diff
> > SVN URL . I need to find out what all revision numbers are missing and
> need
> > to be merged from my Hot FIX to Main Branch ... I saw SVN Diff ..
> >
> > Can any one suggest if there is already an Api???
>
> To get list of not yet merged revisions from one branch to another
> (assuming they have common history) you need to query for eligible
> merge revisions.
> With SVNKit you may do this with
> SVNDiffClient.doGetLogEligibleMergeInfo method - your
> ISVNLogEntryHandler will receive SVNLogEntry objects for revisions
> that aren't merged yet.
>
>
> 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 28 January 2013 20:11, souachar <[hidden
> email]<http://user/SendEmail.jtp?type=node&node=177787&i=0>>
> wrote:
>
> > HI Experts,
> > I would like to create a integration report from 2
> Diff
> > SVN URL . I need to find out what all revision numbers are missing and
> need
> > to be merged from my Hot FIX to Main Branch ... I saw SVN Diff ..
> >
> > Can any one suggest if there is already an Api???
> >
> >
> >
> > --
> > View this message in context:
> http://subversion.1072662.n5.nabble.com/Want-to-create-Integration-Report-From-2-diff-SVN-URL-tp177768.html
> > Sent from the SVNKit - Users mailing list archive at Nabble.com.
> >
>
>
>
> ------------------------------
> If you reply to this email, your message will be added to the discussion
> below:
>
> http://subversion.1072662.n5.nabble.com/Want-to-create-Integration-Report-From-2-diff-SVN-URL-tp177768p177787.html
> To start a new topic under SVNKit - Users, email
> ml-node+s1072662n4...@n5.nabble.com
> To unsubscribe from Want to create Integration Report From 2 diff SVN URL,
> click
> here<http://subversion.1072662.n5.nabble.com/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=177768&code=Y3NlLnNvdW15YUBnbWFpbC5jb218MTc3NzY4fC0xNzU0NTE5NDk4>
> .
> NAML<http://subversion.1072662.n5.nabble.com/template/NamlServlet.jtp?macro=macro_viewer&id=instant_html%21nabble%3Aemail.naml&base=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespace&breadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml>
>
--
Regards and Thanks
Soumya Kanti Acharya
--
View this message in context:
http://subversion.1072662.n5.nabble.com/Want-to-create-Integration-Report-From-2-diff-SVN-URL-tp177768p178070.html
Sent from the SVNKit - Users mailing list archive at Nabble.com.
