Piet-Hein Peeters wrote: > The simpler test case: > > merge from trunk -> branch1 ->branch2
How does this differ from testTransitiveMerge in svnmerge_test.py? > I can't make it simpler than this. A conflict is raised and a > dir_conflicts.prej file is generated everytime a revision is merged is > which the svnmerge-integrated property has changed. What version of svn are you using? Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
