subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r881943 - in /subversion/branches: 1.5.x/STATUS 1.6.x/STATUS
Date Wed, 18 Nov 2009 21:30:35 GMT
Author: danielsh
Date: Wed Nov 18 21:30:35 2009
New Revision: 881943

URL: http://svn.apache.org/viewvc?rev=881943&view=rev
Log:
Add 840074 to all revnums, except those in branch names.

Modified:
    subversion/branches/1.5.x/STATUS
    subversion/branches/1.6.x/STATUS

Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=881943&r1=881942&r2=881943&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Wed Nov 18 21:30:35 2009
@@ -14,7 +14,7 @@
 Candidate changes for 1.5.8:
 ============================
 
- * r36106
+ * r876180
    Resolves issue #3374, "svn cp --parents path URL encoding issues"
    For
      svn cp --parent ^/fö ^/dö/fö
@@ -28,7 +28,7 @@
      -0: gstein (encoding issues are tricky; I'd rather tell people to
                  upgrade to 1.6.0, rather than 1.5.6)
 
- * r36111
+ * r876185
    On Windows don't retry deleting a file 100 times when this file is really
    not a file but just a directory.
    Justification:
@@ -40,7 +40,7 @@
                  the user wants the fix, they can upgrade to 1.6.0 rather
                  than 1.5.6)
 
- * r36527
+ * r876601
    Yet another merge performance improvement: Potentially reduce server
    queries about subtree mergeinfo during reverse merges.
    Justification:
@@ -49,7 +49,7 @@
    Votes:
      +1: pburba
 
- * r36730, r36766, r36775
+ * r876804, r876840, r876849
    Fix issue #3383 'Foreign repository merge can add mergeinfo from the
    foreign repos'
    Justification:
@@ -58,28 +58,28 @@
      in the merge target.  The latter might cause real problems, making it
      appear merges have been done that actually have not or vice-versa.
    Notes:
-     r36775 is the fix, the other revisions are expansion of an existing
+     r876849 is the fix, the other revisions are expansion of an existing
      merge test to cover this issue.  There are some minor conflicts, a
      backport branch can be found at
      http://svn.collab.net/repos/svn/branches/1.5.x-r36775.
    Votes:
      +1: pburba, arfrever
 
- * r37072, r37083
+ * r877146, r877157
    Fix issue #3392 'Parsing error with reverse merges and non-inheritable
    mergeinfo'
    Justification:
      Can cause repeat merges to break in the presence of non-inheritable
      mergeinfo.
    Notes:
-     r37072 is a test for the issue, r37083 is the fix.  There is a backport
+     r877146 is a test for the issue, r877157 is the fix.  There is a backport
      branch at http://svn.collab.net/repos/svn/branches/1.5.x-issue3392, but
-     it is dependent on r36879 being merged first.  (If this change *must* be
-     merged before r36879 I'll create a branch to do so - pburba)
+     it is dependent on r876953 being merged first.  (If this change *must* be
+     merged before r876953 I'll create a branch to do so - pburba)
    Votes:
      +1: pburba, arfrever
 
- * r37137
+ * r877211
    Make some sweeping pool lifetime fixes in the BDB backend.
    Justification:
      Bringing 'svn ls -v' over HTTP on a directory with 10000 files
@@ -92,7 +92,7 @@
    Votes:
      +1: cmpilato, arfrever
 
- * r37768
+ * r877842
    Make svnadmin load tolerate mergeinfo with "\r\n".
    Justification:
      Prior to this change you cannot load a dump file that contains Windows
@@ -101,7 +101,7 @@
    Votes:
      +1: pburba, cmpilato
 
- * r37779
+ * r877853
    Fix a potential segfault when doing noop file merges.
    Justification:
      Not common, but a segfault is a segfault.  See
@@ -113,7 +113,7 @@
    Votes:
      +1: pburba
 
- * r38068
+ * r878142
    Fix issue #3119, "File '...' already exists" when it obviously doesn't,
    during commit.
    Justification:
@@ -121,7 +121,7 @@
    Votes:
      +1: stylesen
 
- * r38686-7
+ * r878760-7
    Fix serious bugs in libsvn_ra_svn and svnsync.  (If svnsync errors
    while syncing from svnserve to mod_dav_svn, it commits a
    half-written transaction rather than aborting it.)
@@ -129,13 +129,13 @@
      A potentially large audience of users may unknowingly be creating
      corrupt repository mirrors!
    Notes:
-     Running 'svn merge -r36685:36687 ^/truenk' creates a spurious
+     Running 'svn merge -r876759:876761 ^/truenk' creates a spurious
      one-line conflict for some reason, perhaps due to linefeeds.
      Easy to clean up.
    Votes:
      +1: sussman
 
- * r39019
+ * r879093
    Fix bug where svn_[rangelist|mergeinfo]_[merge|intersect|remove|diff]
    APIs can modify their *non*-output arguments.
    Justification:
@@ -148,14 +148,14 @@
    Votes:
      +1: pburba
 
- * r36023
+ * r876097
    Resolve symlinks when checking ~/.subversion
    Justification:
      It gives flexibility to users to link different .subversion folders.
    Votes:
      +1: stylesen, stsp
 
- * r39219
+ * r879293
    Perform MIME type matching case-insensitively.  (Issue #3479)
    Justification:
      The broken behavior is inconsistent with the way MIME mapping
@@ -163,14 +163,14 @@
    Votes:
      +1: cmpilato
 
- * r40008
+ * r880082
    Respect Apache's ServerSignature directive.
    Justification:
      Many subversion server administrators want it.
    Votes:
      +1: stylesen
 
- * r40200, r40201
+ * r880274, r880275
    Provide examples for specifying an auto-prop value for the svn:keywords
    property which contains several fields separated by whitespace.
    Also tolerate (but don't advertise) quotes around property values in
@@ -187,7 +187,7 @@
 Approved changes:
 =================
 
- * r36851, r36857
+ * r876925, r876931
    'svnadmin upgrade'-ing pre-1.2 repositories fails for lack of
    'db/format' file.
    Justification:

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=881943&r1=881942&r2=881943&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Nov 18 21:30:35 2009
@@ -15,7 +15,7 @@
 
 Candidate changes:
 
- * r37478, r37543, r37544, r37545, r37547
+ * r877552, r877617, r877618, r877619, r877621
    Support using `svnversion` on files and improve some messages printed by
    `svnversion`.
    Justification:
@@ -44,44 +44,44 @@
      +1: arfrever
      -0: rhuijben, cmpilato (Introduces new features and changes output)
 
- * r38004, r38014, r38028, r38122
+ * r878078, r878088, r878102, r878196
    Make KWallet window attached to terminal window.
    Justification:
      Without this change, KWallet window can appear behind terminal window
      and is left after killing terminal.
    Votes:
      +1: arfrever
-     -0: psamuelson, stsp (without r38122) (code is ugly and Linux-specific -
+     -0: psamuelson, stsp (without r878196) (code is ugly and Linux-specific -
                                             would getenv("WINDOWID") work
                                             instead?)
 
- * r38142, r38267, r38269, r36788, r37129, r37521, r37591, r37523, r38195,
-   r38247, r38325, r38349, r38352
+ * r878216, r878341, r878343, r876862, r877203, r877595, r877665, r877597, r878269,
+   r878321, r878399, r878423, r878426
    Fix issue #3432 'Merge can record mergeinfo from natural history gaps'
    Justification:
      Gaps in merge sources can lead to the creation of invalid mergeinfo
      or the removal of valid mergeinfo.
    Notes:     
-     The fix itself in r38325 is relatively simple, but recent refactoring
+     The fix itself in r878399 is relatively simple, but recent refactoring
      of the merge code on trunk makes it look a lot worse than it is.
      Unless otherwise noted, all of the following are nominated simply to
      avoid a conflict nightmare:
-     r38142, r38267, r38269 - New test and test tweaks for the issue.
-     r36788 - Comment changes only.
-     r37129 - Scope reduction of a pool.
-     r37521 - Minor bug fix and some refactoring.
-     r37591 - Comment changes only.
-     r37523 - Merge code refactoring.
-     r38195 - Pool use cleanup, no functional change.
-     r38247 - More merge code refactoring.
-     r38349 - Variable rename to avoid shadowing a previous local.
-     r38352 - Remove an unused variable.
+     r878216, r878341, r878343 - New test and test tweaks for the issue.
+     r876862 - Comment changes only.
+     r877203 - Scope reduction of a pool.
+     r877595 - Minor bug fix and some refactoring.
+     r877665 - Comment changes only.
+     r877597 - Merge code refactoring.
+     r878269 - Pool use cleanup, no functional change.
+     r878321 - More merge code refactoring.
+     r878423 - Variable rename to avoid shadowing a previous local.
+     r878426 - Remove an unused variable.
    Branch:
      ^/branches/1.6.x-issue3432
    Votes:
      +1: pburba, stsp
 
- * r35958, r36030, r38373, r38836, r38837, r38842
+ * r876032, r876104, r878447, r878910, r878911, r878916
    Several fixes to the Win32 exception handler. This change also makes it
    available on Windows Vista and 7 where it was previously blocked by a
    version check.
@@ -90,7 +90,7 @@
      have development tools installed. (Most users on Windows).
    Notes:
      Most of these revisions cancel out each other. The real changes are in
-     r38373 (removing version check) and r38836,r38842 (fixing formatting
+     r878447 (removing version check) and r878910,r878916 (fixing formatting
      specifier). It's probably easier to review the combined patch than the
      individual revisions.
    Branch:
@@ -100,7 +100,7 @@
      +0: pburba - I don't have a Vista or Win7 box to try this out on, but it
          works fine on my XP box.
 
- * r39019
+ * r879093
    Fix bug where svn_[rangelist|mergeinfo]_[merge|intersect|remove|diff]
    APIs can modify their *non*-output arguments.
    Justification:
@@ -118,12 +118,12 @@
            and also it seems to sneak in another bug fix in
            fix_deleted_subtree_ranges(). I suggest splitting up this patch.)
 
- * r39614
+ * r879688
    Support Berkeley DB 4.8.
    Votes:
      +1: arfrever, dlr
 
- * r39692
+ * r879766
    Fix issue #3498: Subversion password stores freeze Eclipse
    Justification:
      All subclipse users are in great need of this.
@@ -135,7 +135,7 @@
      +1: stylesen
      +0: julianfoad (reviewed, not tested)
 
- * r39828, r39842
+ * r879902, r879916
    Disables file synchronization mutexes in fsfs on Windows. These mutexes
    were added to make POSIX systems lock files that were in use by other
    threads in the same process.
@@ -160,20 +160,20 @@
    Votes:
      +1: hwright, arfrever
 
- * r35558 (from ^/branches/http-protocol-v2@r35558), r40296
+ * r875632 (from ^/branches/http-protocol-v2@r875632), r880370
    Fix issue #3519: ra_serf using Label header unsupported by mod_dav_svn.
    Justification:
      This is the cause of the switch-tests.py 19 failures we've been ignoring
      for our 1.6.x releases.
    Notes:
-     r35558 (from the http-protocol-v2 branch) is a plumbing change.
-     r40296 (from trunk) is the real fix.
+     r875632 (from the http-protocol-v2 branch) is a plumbing change.
+     r880370 (from trunk) is the real fix.
    Branch:
      ^/branches/1.6.x-issue3519
    Votes:
      +1: cmpilato
 
- * r40200, r40201
+ * r880274, r880275
    Provide examples for specifying an auto-prop value for the svn:keywords
    property which contains several fields separated by whitespace.
    Also tolerate (but don't advertise) quotes around property values in
@@ -184,7 +184,7 @@
      quoting characters.
    Notes:
      There is a trivial text conflict in autoprop_tests.py. To resolve it,
-     use 'postpone' or 'edit', and keep lines added by merge-right.r40201
+     use 'postpone' or 'edit', and keep lines added by merge-right.r880275
      except the one reading:
                     'escapetest',
      If correctly resolved, the 'filenames' list looks like this:
@@ -198,7 +198,7 @@
    Votes:
      +1: stsp, arfrever
 
- * r40400
+ * r880474
    Really fix issue #2580 on Win32.
    Justification:
      svn+ssh:// isn't usable on Windows in certain situations.
@@ -207,7 +207,7 @@
    Votes:
      +1: stsp, dlr
 
- * r40451, r40452
+ * r880525, r880526
    Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
    a subdirectory of the current working directory.
    Justification:
@@ -215,12 +215,12 @@
    Notes:
      A backport branch is at ^/branches/1.6.x-r40452.
      1.6.x has an additional bug which does not occur on trunk, requiring
-     additional fixes exclusive to 1.6.x. See the log message of r40458
-     (which shows what the bug is), and see r40459 (which fixes the bug).
+     additional fixes exclusive to 1.6.x. See the log message of r880532
+     (which shows what the bug is), and see r880533 (which fixes the bug).
    Votes:
      +1: stsp
 
- * r40478
+ * r880552
    Try to enable TCP keep-alives in svnserve.
    Justification:
      ra_svn clients do this, too. It should not do any harm.



Mime
View raw message