On Fri, May 13, 2005 at 11:58:05AM -0400, Stas Bekman wrote:
> Joe Orton wrote:
> >the script does the merge from between 165203 and HEAD of the trunk into
> >that working copy, and resets the merge-point property to the revision
> >number of the HEAD, ready for next time. So finally you just commit the
> >working copy.
> >
> >Does that make sense?
>
> /home/stas/apache.org/mp2-no-clone> svn propset merge-point 165203 .
> property 'merge-point' set on '.'
>
> /home/stas/apache.org/mp2-no-clone> ./svn.remerge
> ./svn.remerge: merging from trunk from r165203 to r
...beats me, works OK here. What does:
$ svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL: //;p}'
produce for your working copy of the branch? Nothing? And just "svn
info ."? What version of svn are you using? I'm using 1.1.4.
joe
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
