[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: Brian Neal <bgneal_at_gmail.com>
Date: Fri, 10 Jun 2011 07:50:47 -0500

On Fri, Jun 10, 2011 at 4:28 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Fri, Jun 10, 2011 at 11:25:23AM +0200, Stefan Sperling wrote:
>> On Fri, Jun 10, 2011 at 11:16:44AM +0200, Johan Corveleyn wrote:
>> > On Fri, Jun 10, 2011 at 11:07 AM, Stefan Sperling <stsp_at_elego.de> wrote:
>> >
>> > ...
>> > > svn ps color green $branch/alpha
>> > > svn commit $trunk -m "set color to green"
>> >
>> > Shouldn't the above be 'svn commit $branch ...'?
>>
>> Ooops, you're right, thanks for catching that!
>> Yeah, with this change the script does indeed cause a spurious conflict,
>> even in 1.7.
>
> 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.

Best regards,
BN
Received on 2011-06-10 14:51:21 CEST

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