[Svnmerge] [PATCH] Handle transitive merging property conflicts forboth merged/blocked revs

[Raman Gupta]

Piet-Hein Peeters wrote:
> Hello Raman,
> 
> I tried to patch svnmerge.py, but it was not completely succesfull:
> 
> patch svnmerge.py < c:\temp\svnmergepy.patch
> patching file `svnmerge.py'
> Hunk #1 succeeded at 25 with fuzz 1.
> Hunk #2 FAILED at 1166.
> Hunk #3 succeeded at 1182 with fuzz 2 (offset -17 lines).
> 1 out of 3 hunks FAILED -- saving rejects to svnmerge.py.rej

I suspect it didn't work for you because the patch is against trunk,
not my previously patched version. I'm not sure what the list policy
is for larger attachments, so download the entire thing from here:

http://pastebin.ca/raw/605786

Cheers,
Raman