[Svnmerge] [PATCH] Eliminate spurious svnmerge-integrated property conflicts

[Auke Jilderda]

On Wednesday 14 February 2007 19:10, Raman Gupta wrote:
>
> For this use case, my patch should resolve the issue you are having
> with property conflicts, without any loss of information:
> ...

Excellent.

> I think I see the confusion. 
> ...
> Does that clear things up?

Certainly, thanks.  Always good to make sure what exactly we're talking about.

> Yes correct. The value it keeps will be correct. 
> ...

Yes, testing confirms this.

> ...
> My patch, in the course of eliminating the property conflict, does
> remove the merge information from C on A. However, in your use case,
> it is enough to know which revs from B have been merged into C
> (regardless of whether they originally came from A or not), and my
> patch does not remove that.

Understood.

Thanks for your help!  With your patch, we can move forward for our use case 
until the 1.5 arrives which will probably address all of this.


Auke