[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging Properties?

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 10 Jun 2011 15:47:23 +0200

On Fri, Jun 10, 2011 at 07:50:47AM -0500, Brian Neal wrote:
> On Fri, Jun 10, 2011 at 4:28 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> > Filed http://subversion.tigris.org/issues/show_bug.cgi?id=3919
> >
> Thank you Stefan for reproducing the issue with the script and
> reporting it as a bug. I'd be willing to try to work up a patch or
> help resolve the bug in any way. Just give me a bit of a nudge in the
> right direction.

The problem is probably somewhere in the function
maybe_generate_propconflict() in subversion/libsvn_wc/props.c.
I think it has been written with update in mind and makes wrong
assumptions for merge. I haven't had enough time to dig in deeper.
If you can figure it out, please send a patch :) Thanks!
Received on 2011-06-10 15:47:59 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.