[Svnmerge] [PATCH] Handle transitive merging propertyconflictsforbothmerged/blockedrevs

[Piet-Hein Peeters]

svnmerge-bounces+piet-hein.peeters=philips.com at orcaware.com wrote on
08/07/2007 04:08:12 PM:

> Piet-Hein Peeters wrote:
> > The simpler test case:
> >
> > merge from trunk -> branch1 ->branch2
>
> How does this differ from testTransitiveMerge in svnmerge_test.py?

I think there is no difference.

>
> > 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?
>

We are using svn 1.4.3

> Cheers,
> Raman Gupta
>
> _______________________________________________
> Svnmerge mailing list
> Svnmerge at orcaware.com
> http://www.orcaware.com/mailman/listinfo/svnmerge
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20070807/6af7c01a/attachment.html>