Anyone have any ideas? I'm still trying to figure this out. Is there a specific version of svn that i need to use?
akromm wrote: > > Hi > > I have a dummy repository set up as follows > > /trunk > /branches/integration > /branches/team1 > /branches/team2 > > and i started by creating some files in trunk then merged them into the 3 > branches. > > I then created files in team1 and team2 then merged them into integration. > > I then merged integration into trunk. > > I then merge integration into each team branch. > > I then modified the files in various positions and repeated the above 4 > steps. > > I then use SVNKit to determine at what file revision the merges occur at. > According to SVNKit (unless i'm doing it wrong) there werent any merges. > > What I do is get all the files in a directory (eg. /trunk) then loop > through all of them and get all the SVNFileRevision info from the server. > > I then loop through all the collections of SVNFileRevisions and on each > one i call isResultOfMerge() and for all of them it says false. > > Here is an example of the output. > > <code> > Files in repo:7 > File: Monster.cpp Number of revisions: 4 > Rev Number: 9 is from merge: false > Rev Number: 11 is from merge: false > Rev Number: 14 is from merge: false > Rev Number: 24 is from merge: false > File: Map.h Number of revisions: 3 > Rev Number: 10 is from merge: false > Rev Number: 15 is from merge: false > Rev Number: 23 is from merge: false > File: Monster.h Number of revisions: 3 > Rev Number: 9 is from merge: false > Rev Number: 14 is from merge: false > Rev Number: 24 is from merge: false > File: Map.cpp Number of revisions: 3 > Rev Number: 10 is from merge: false > Rev Number: 15 is from merge: false > Rev Number: 23 is from merge: false > File: character.cpp Number of revisions: 5 > Rev Number: 2 is from merge: false > Rev Number: 6 is from merge: false > Rev Number: 12 is from merge: false > Rev Number: 23 is from merge: false > Rev Number: 25 is from merge: false > </code> > > > > Am I doing something wrong? Or is there something extra I need to do for > this function to work? > > Thanks. > -- View this message in context: http://old.nabble.com/SVNFileRevision.isResultOfMerge-not-detecting-merges.-tp32238214p32253530.html Sent from the SVNKit - Users mailing list archive at Nabble.com.
