Joe Orton wrote: [...]
% svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL://;p}' https://svn.apache.org/repos/asf/perl/modperl/trunk
That's the trunk, not a branch. The script should be run from a checkout of the *branch* which you're trying to merge into.
(unless we are talking completely at cross purposes - my script can be used to ease maintenance of a branch which needs to be merged from the trunk periodically. Not the other way round...)
Heh, thanks for the spot, Joe. I have too many checked out things with similar names :)
So it worked :) The log is below.
So now can I just commit all those changes at once? will a future merge into the trunk know how to deal with that?
% svn info .
Path: .
URL: https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 165380
Node Kind: directory
Schedule: normal
Last Changed Author: stas
Last Changed Rev: 165380
Last Changed Date: 2005-04-30 02:16:48 -0400 (Sat, 30 Apr 2005)
Properties Last Updated: 2005-04-30 02:50:49 -0400 (Sat, 30 Apr 2005)
% svn propset merge-point 165203 . property 'merge-point' set on '.'
%./svn.remerge
./svn.remerge: merging from trunk from r165203 to r170392
+ svn merge -r165203:170392 https://svn.apache.org/repos/asf/perl/modperl/trunk .
U RELEASE
U STATUS
U META.yml
U Makefile.PL
U src/modules/perl/modperl_filter.c
U src/modules/perl/modperl_filter.h
U src/modules/perl/modperl_util.c
U xs/maps/modperl_functions.map
U xs/maps/apr_functions.map
U xs/ModPerl/Util/ModPerl__Util.h
A xs/ModPerl/Util/Util_pm
U xs/APR/Status/APR__Status.h
U xs/tables/current/ModPerl/FunctionTable.pm
U README
U t/apr
U t/filter/TestFilter/both_str_native_remove.pm
U t/filter/TestFilter/both_str_req_mix.pm
U t/filter/TestFilter/in_bbs_underrun.pm
U t/filter/TestFilter/out_str_ctx.pm
U t/filter/TestFilter/in_str_consume.pm
A t/filter/TestFilter/out_str_buffer.pm
A t/filter/out_str_buffer.t
U t/protocol/TestProtocol/echo_timeout.pm
U t/protocol/TestProtocol/echo_bbs.pm
U t/protocol/TestProtocol/echo_bbs2.pm
U t/protocol/TestProtocol/echo_nonblock.pm
U t/protocol/TestProtocol/echo_filter.pm
U t/lib/TestCommon/FilterDebug.pm
U todo/release
U todo/bugs_mp
U lib/ModPerl/TestReport.pm
U lib/ModPerl/BuildOptions.pm
U lib/Apache2/Build.pm
U lib/Bundle/Apache2.pm
U lib/mod_perl2.pm
U Changes
U ModPerl-Registry/t/basic.t
U ModPerl-Registry/t/conf/extra.conf.in
A ModPerl-Registry/t/cgi-bin/prefork.pl
A ModPerl-Registry/t/prefork.t
U ModPerl-Registry/lib/ModPerl/PerlRun.pm
U ModPerl-Registry/lib/ModPerl/Registry.pm
U ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
A ModPerl-Registry/lib/ModPerl/PerlRunPrefork.pm
A ModPerl-Registry/lib/ModPerl/RegistryPrefork.pm
+ svn propset merge-point 170392
property 'merge-point' set on '.'
+ svn log -r165204:170392 https://svn.apache.org/repos/asf/perl/modperl/trunk
-- __________________________________________________________________ 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]
