You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/11/22 23:35:59 UTC
svn commit: r1544706 - /subversion/branches/1.7.x/STATUS
Author: rhuijben
Date: Fri Nov 22 22:35:58 2013
New Revision: 1544706
URL: http://svn.apache.org/r1544706
Log:
* STATUS: Remove r1435635 group nomination.
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=1544706&r1=1544705&r2=1544706&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Nov 22 22:35:58 2013
@@ -15,22 +15,6 @@ Status of 1.7.15:
Candidate changes:
==================
- * r1435635, r1435714, r1435722, r1435737
- When svn update removes a switched subtree because it was deleted in the
- target revision, it would be nice if a future update would bring back
- the originally node that existed before switching. (Issue #4295)
- Justification:
- After this operation the working copy doesn't match the repository
- without obviouse way to recover.
- Notes:
- The real fix is in r1435722. The other revisions tweak the test that
- also triggered a different revision on trunk.
- Branch:
- ^/subversion/branches/1.7.x-issue-4295
- Votes:
- +1: rhuijben
- +0: stsp (nice fix, but backport doesn't compile)
-
* r1438879
Make 'show-diff' at the interactive conflict prompt show nicer diffs.
Justification: