On Mar 8, 2007, at 2:06 PM, Raman Gupta wrote: > Thomas F. O'Connell wrote: >> Raman, >> >> Thanks so much for the help. Sorry I overlooked the request for the >> proplist. Here they are: >> >> trunk: >> Properties on '.': >> svnmerge-blocked : /branches/branch-1:2954,2982-2983 >> /branches/branch-2:2663,2804,2848 >> svnmerge-integrated : >> /branches/branch-3:1-2931,2934-2989,2994-3001,3008 >> /branches/branch-1:1-2953,2955-2981,2984 >> /branches/branch-2:1-2847,2849-2894,2899-3094 /branches/stage:1-2528 >> /branches/branch-4:1-2833 /trunk:1-2527 > ^^^^^^^^^^^^^ > As I suspected (and described in my last post) I believe herein lies > the source of your problems. At some point in the past (probably a > manual merge from another branch), your trunk integrated property was > updated with the value from some branch, resulting in the trunk having > itself as a merge source. > > This explains the problem you were having in the previous thread when > you create a new branch (the reason for which I explained in my last > email). This also probably explains the conflict you are getting now. > > Cheers, > Raman
Raman, Thanks so much for the assistance. I'll try to restore the svnmerge- related properties per your guide earlier in the thread. -- Thomas F. O'Connell optimizing modern web applications : for search engines, for usability, and for performance : http://o.ptimized.com/ 615-260-0005 _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
