[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1723003 - /subversion/branches/1.9.x/STATUS

From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 5 Jan 2016 12:42:38 +0100

> -----Original Message-----
> From: jamessan_at_apache.org [mailto:jamessan_at_apache.org]
> Sent: dinsdag 5 januari 2016 05:59
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1723003 - /subversion/branches/1.9.x/STATUS
>
> Author: jamessan
> Date: Tue Jan 5 04:58:36 2016
> New Revision: 1723003
>
> URL: http://svn.apache.org/viewvc?rev=1723003&view=rev
> Log:
> * STATUS: Nominate r1721488.
>
> Modified:
> subversion/branches/1.9.x/STATUS
>
> Modified: subversion/branches/1.9.x/STATUS
> URL:
> http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1723
> 003&r1=1723002&r2=1723003&view=diff
> ==========================================================
> ====================
> --- subversion/branches/1.9.x/STATUS (original)
> +++ subversion/branches/1.9.x/STATUS Tue Jan 5 04:58:36 2016
> @@ -122,6 +122,13 @@ Candidate changes:
> Votes:
> +1: jamessan
>
> + * r1721488, r1721648
> + Enable building bindings with SWIG >= 3.0.6
> + Justification:
> + Enable building bindings with SWIG 3.x
> + Votes:
> + +1: jamessan

I think this nomination needs another addition and/or a backport branch.
[[
$ merge -c "r1721488, r1721648" ^^/subversion/trunk --non-interactive
--- Merging r1721488 into '.':
U subversion\bindings\swig\include\proxy.swg
U subversion\bindings\swig\INSTALL
U build\ac-macros\swig.m4
--- Recording mergeinfo for merge of r1721488 into '.':
 U .
--- Merging r1721648 into '.':
G subversion\bindings\swig\INSTALL
A subversion\bindings\swig\include\proxy.py
G subversion\bindings\swig\include\proxy.swg
C build\ac-macros\swig.m4
--- Recording mergeinfo for merge of r1721648 into '.':
 G .
Summary of conflicts:
  Text conflicts: 1
]]

        Bert
Received on 2016-01-05 12:42:59 CET

This is an archived mail posted to the Subversion Dev mailing list.