Joe Orton wrote:
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.
% svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL://;p}'
https://svn.apache.org/repos/asf/perl/modperl/trunk
% svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL://;p}'
https://svn.apache.org/repos/asf/perl/modperl/trunk
/home/stas/apache.org/mp2-no-clone> svn info .Path: .
URL: https://svn.apache.org/repos/asf/perl/modperl/trunk
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 164854
Node Kind: directory
Schedule: normal
Last Changed Author: stas
Last Changed Rev: 164431
Last Changed Date: 2005-04-23 20:24:47 -0400 (Sat, 23 Apr 2005)
Properties Last Updated: 2005-04-05 12:17:48 -0400 (Tue, 05 Apr 2005)
% svn --version
svn, version 1.1.3 (r12730)
I'll try to upgade to 1.1.4
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
