[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 11:25:23 +0200

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.
Received on 2011-06-10 11:26:00 CEST

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