perl-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stas Bekman <>
Subject Re: syncing branches with trunk, how?
Date Tue, 17 May 2005 15:32:07 GMT
Joe Orton wrote:
>>% svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL://;p}'
> 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: .
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: merging from trunk from r165203 to r170392
+ svn merge -r165203:170392 .
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/
U  xs/maps/
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/
  U t/apr
U  t/filter/TestFilter/
U  t/filter/TestFilter/
U  t/filter/TestFilter/
U  t/filter/TestFilter/
U  t/filter/TestFilter/
A  t/filter/TestFilter/
A  t/filter/out_str_buffer.t
U  t/protocol/TestProtocol/
U  t/protocol/TestProtocol/
U  t/protocol/TestProtocol/
U  t/protocol/TestProtocol/
U  t/protocol/TestProtocol/
U  t/lib/TestCommon/
U  todo/release
U  todo/bugs_mp
U  lib/ModPerl/
U  lib/ModPerl/
U  lib/Apache2/
U  lib/Bundle/
U  lib/
U  Changes
U  ModPerl-Registry/t/basic.t
U  ModPerl-Registry/t/conf/
A  ModPerl-Registry/t/cgi-bin/
A  ModPerl-Registry/t/prefork.t
U  ModPerl-Registry/lib/ModPerl/
U  ModPerl-Registry/lib/ModPerl/
U  ModPerl-Registry/lib/ModPerl/
A  ModPerl-Registry/lib/ModPerl/
A  ModPerl-Registry/lib/ModPerl/
+ svn propset merge-point 170392
property 'merge-point' set on '.'
+ svn log -r165204:170392

Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker     mod_perl Guide --->

To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message