John Smith wrote: > Below is the sequence of commands and output--with annotations--of my > attempts with svnmerge. The end-result is an error condition; a property > conflict with svnmerge-integrated. I'd very much appreciate anyone who > could tell me what I'm doing wrong, or if I should be doing something > differently. Thanks again.
I submitted a patch a few weeks ago that might solve this problem (YMMV). None of the committers have reviewed it yet, but you might want to apply it to your local copy and see what happens. http://article.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel/309 Cheers, Raman _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
