On Tue, Mar 6, 2012 at 12:50, <julianfoad_at_apache.org> wrote:
> Author: julianfoad
> Date: Tue Mar 6 17:50:23 2012
> New Revision: 1297604
>
> URL: http://svn.apache.org/viewvc?rev=1297604&view=rev
> Log:
> On the 'reintegrate-keep-alive' branch: Catch up to trunk_at_1297591.
>
> Added:
> subversion/branches/reintegrate-keep-alive/tools/dev/mergegraph/
> - copied from r1295003, subversion/trunk/tools/dev/mergegraph/
> subversion/branches/reintegrate-keep-alive/tools/examples/info.rb
> - copied unchanged from r1295003, subversion/trunk/tools/examples/info.rb
> subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/
> - copied from r1295003, subversion/trunk/tools/server-side/svnpubsub/
> subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svnwcsub.tac
> - copied unchanged from r1297591, subversion/trunk/tools/server-side/svnpubsub/svnwcsub.tac
> Modified:
>...
> Propchange: subversion/branches/reintegrate-keep-alive/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Mar 6 17:50:23 2012
> @@ -57,4 +57,4 @@
> /subversion/branches/tree-conflicts:868291-873154
> /subversion/branches/tree-conflicts-notify:873926-874008
> /subversion/branches/uris-as-urls:1060426-1064427
> -/subversion/trunk:1234907-1239494
> +/subversion/trunk:1234907-1295003,1295006-1297591
More ugliness from our discontinuity on trunk/
:-(
Received on 2012-03-06 19:27:33 CET