You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2011/09/03 04:49:16 UTC
svn commit: r1164796 - /subversion/branches/1.7.x/STATUS
Author: neels
Date: Sat Sep 3 02:49:16 2011
New Revision: 1164796
URL: http://svn.apache.org/viewvc?rev=1164796&view=rev
Log:
* STATUS: Nominate branches/1.7.x-issue4000.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1164796&r1=1164795&r2=1164796&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Sep 3 02:49:16 2011
@@ -178,6 +178,26 @@ Candidate changes:
Votes:
+1: pburba, philip
+ * branches/1.7.x-issue4000
+ Fix issue #4000 'WC-WC-copy of file external creates first-class file node'
+ and don't break file external state when committing a file external.
+ Justification:
+ Inconsistency. Can create collisions between externals definitions and
+ versioned nodes.
+ r1164027 is included since it inadvertently fixes the re-appearance of
+ issue #4000 on a file external that has been committed.
+ Notes:
+ Since r1164027 prevents the NODES table's FILE_EXTERNAL column from
+ being blanked out during commit bumping, it probably fixes a number of
+ other problems with committed file externals that I'm not aware of ATM.
+ Conflicts:
+ C externals_tests.py
+ branches/1.7.x-issue4000@ 1164785 1164786 1164792
+ are clean versions of trunk@ 1164027 1164760 1164765
+ and are the: corner case fix^ main fix^ ^test
+ Votes:
+ +1: neels
+
Veto-blocked changes:
=====================
Re: svn commit: r1164796 - /subversion/branches/1.7.x/STATUS
Posted by Philip Martin <ph...@wandisco.com>.
neels@apache.org writes:
> Author: neels
> Date: Sat Sep 3 02:49:16 2011
> New Revision: 1164796
>
> URL: http://svn.apache.org/viewvc?rev=1164796&view=rev
> Log:
> * STATUS: Nominate branches/1.7.x-issue4000.
>
> Modified:
> subversion/branches/1.7.x/STATUS
>
> Modified: subversion/branches/1.7.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1164796&r1=1164795&r2=1164796&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Sat Sep 3 02:49:16 2011
> @@ -178,6 +178,26 @@ Candidate changes:
> Votes:
> +1: pburba, philip
>
> + * branches/1.7.x-issue4000
> + Fix issue #4000 'WC-WC-copy of file external creates first-class file node'
> + and don't break file external state when committing a file external.
Is issue 4000 fixed? It is not marked fixed in the issue tracker. I
think this is a behaviour change from 1.6, it should be mentioned in
CHANGES.
--
Philip