Re: Merging Properties?

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
Received on 2011-06-10 11:29:21 CEST