[Svnmerge] svnmerge and multiple branch problems

Raman Gupta rocketraman at fastmail.fm
Sun Nov 5 20:04:11 PST 2006


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



More information about the Svnmerge mailing list