You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/01/22 04:39:04 UTC
svn commit: r901971 - in /subversion/tags/1.6.6: ./ CHANGES STATUS
subversion/include/svn_version.h
Author: cmpilato
Date: Fri Jan 22 03:39:03 2010
New Revision: 901971
URL: http://svn.apache.org/viewvc?rev=901971&view=rev
Log:
Oops! Fully revert the mis-aimed r901969. (Darned switched working copy.)
Modified:
subversion/tags/1.6.6/ (props changed)
subversion/tags/1.6.6/CHANGES (props changed)
subversion/tags/1.6.6/STATUS
subversion/tags/1.6.6/subversion/include/svn_version.h
Propchange: subversion/tags/1.6.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 22 03:39:03 2010
@@ -1,48 +1,48 @@
-subversion/branches/1.5.x-r30215:870312
-subversion/branches/1.6.x-UNC-paths:876471-876545
-subversion/branches/1.6.x-dirent-basename:876130-876262
-subversion/branches/1.6.x-issue3443:878597-879480
-subversion/branches/1.6.x-no-svn_uri:876360-876415
-subversion/branches/1.6.x-r36178:877876-877884
-subversion/branches/1.6.x-r36252:876328-876788
-subversion/branches/1.6.x-r37622:877699-877993
-subversion/branches/1.6.x-r37627:877704-877928
-subversion/branches/1.6.x-r37857:877932-877936
-subversion/branches/1.6.x-r37953:879809-880071
-subversion/branches/1.6.x-r37988:878063-878897
-subversion/branches/1.6.x-r38000:879083-879767
-subversion/branches/1.6.x-r38222:878299-878891
-subversion/branches/1.6.x-r38572:878661-878666
-subversion/branches/1.6.x-r38799:878880-878917
-subversion/branches/1.6.x-r38927:879002-879176
-subversion/branches/1.6.x-r39557:879668-879907
-subversion/branches/1.6.x-r39887:880024-880066
-subversion/branches/bdb-reverse-deltas:872050-872529
-subversion/branches/diff-callbacks3:870059-870761
-subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
-subversion/branches/double-delete:870511-872970
-subversion/branches/file-externals:871779-873302
-subversion/branches/fs-rep-sharing:869036-873803
-subversion/branches/fsfs-pack:873717-874575
-subversion/branches/gnome-keyring:870558-871410
-subversion/branches/in-memory-cache:869829-871452
-subversion/branches/issue-2843-dev:871432-874179
-subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
-subversion/branches/issue-3067-deleted-subtrees:873375-874084
-subversion/branches/issue-3148-dev:875193-875204
-subversion/branches/issue-3220-dev:872210-872226
-subversion/branches/issue-3334-dirs:875156-875867
-subversion/branches/kwallet:870785-871314
-subversion/branches/log-g-performance:870941-871032
-subversion/branches/merge-skips-obstructions:874525-874615
-subversion/branches/reintegrate-improvements:873853-874164
-subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
-subversion/branches/svnpatch-diff:871905,871986
-subversion/branches/svnserve-logging:869828-870893
-subversion/branches/tc-issue-3334:874697-874773
-subversion/branches/tc-merge-notify:874017-874062
-subversion/branches/tc-resolve:874191-874239
-subversion/branches/tc_url_rev:874351-874483
-subversion/branches/tree-conflicts:868291-873154
-subversion/branches/tree-conflicts-notify:873926-874008
-subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,877191,877195,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877601,877612,877667
,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-878297,878303,878335,878338,878353,878364,878367-878368,878385,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747,879954,879961,880082,880095,880105
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.6.x-UNC-paths:876471-876545
+/subversion/branches/1.6.x-dirent-basename:876130-876262
+/subversion/branches/1.6.x-issue3443:878597-879480
+/subversion/branches/1.6.x-no-svn_uri:876360-876415
+/subversion/branches/1.6.x-r36178:877876-877884
+/subversion/branches/1.6.x-r36252:876328-876788
+/subversion/branches/1.6.x-r37622:877699-877993
+/subversion/branches/1.6.x-r37627:877704-877928
+/subversion/branches/1.6.x-r37857:877932-877936
+/subversion/branches/1.6.x-r37953:879809-880071
+/subversion/branches/1.6.x-r37988:878063-878897
+/subversion/branches/1.6.x-r38000:879083-879767
+/subversion/branches/1.6.x-r38222:878299-878891
+/subversion/branches/1.6.x-r38572:878661-878666
+/subversion/branches/1.6.x-r38799:878880-878917
+/subversion/branches/1.6.x-r38927:879002-879176
+/subversion/branches/1.6.x-r39557:879668-879907
+/subversion/branches/1.6.x-r39887:880024-880066
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff:871905,871986
+/subversion/branches/svnserve-logging:869828-870893
+/subversion/branches/tc-issue-3334:874697-874773
+/subversion/branches/tc-merge-notify:874017-874062
+/subversion/branches/tc-resolve:874191-874239
+/subversion/branches/tc_url_rev:874351-874483
+/subversion/branches/tree-conflicts:868291-873154
+/subversion/branches/tree-conflicts-notify:873926-874008
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876109,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,877191,877195,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877601,877612,87766
7,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-878297,878303,878335,878338,878353,878364,878367-878368,878385,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747,879954,879961,880082,880095,880105
Propchange: subversion/tags/1.6.6/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 22 03:39:03 2010
@@ -1,48 +1,48 @@
-subversion/branches/1.5.x-r30215/CHANGES:870312
-subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
-subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
-subversion/branches/1.6.x-issue3443/CHANGES:878597-879480
-subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
-subversion/branches/1.6.x-r36178/CHANGES:877876-877884
-subversion/branches/1.6.x-r36252/CHANGES:876328-876788
-subversion/branches/1.6.x-r37622/CHANGES:877699-877993
-subversion/branches/1.6.x-r37627/CHANGES:877704-877928
-subversion/branches/1.6.x-r37857/CHANGES:877932-877936
-subversion/branches/1.6.x-r37953/CHANGES:879809-880071
-subversion/branches/1.6.x-r37988/CHANGES:878063-878897
-subversion/branches/1.6.x-r38000/CHANGES:879083-879767
-subversion/branches/1.6.x-r38222/CHANGES:878299-878891
-subversion/branches/1.6.x-r38572/CHANGES:878661-878666
-subversion/branches/1.6.x-r38799/CHANGES:878880-878917
-subversion/branches/1.6.x-r38927/CHANGES:879002-879176
-subversion/branches/1.6.x-r39557/CHANGES:879668-879907
-subversion/branches/1.6.x-r39887/CHANGES:880024-880066
-subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
-subversion/branches/diff-callbacks3/CHANGES:870059-870761
-subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
-subversion/branches/double-delete/CHANGES:870511-872970
-subversion/branches/file-externals/CHANGES:871779-873302
-subversion/branches/fs-rep-sharing/CHANGES:869036-873803
-subversion/branches/fsfs-pack/CHANGES:873717-874575
-subversion/branches/gnome-keyring/CHANGES:870558-871410
-subversion/branches/in-memory-cache/CHANGES:869829-871452
-subversion/branches/issue-2843-dev/CHANGES:871432-874179
-subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
-subversion/branches/issue-3067-deleted-subtrees/CHANGES:873375-874084
-subversion/branches/issue-3148-dev/CHANGES:875193-875204
-subversion/branches/issue-3220-dev/CHANGES:872210-872226
-subversion/branches/issue-3334-dirs/CHANGES:875156-875867
-subversion/branches/kwallet/CHANGES:870785-871314
-subversion/branches/log-g-performance/CHANGES:870941-871032
-subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
-subversion/branches/reintegrate-improvements/CHANGES:873853-874164
-subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
-subversion/branches/svnpatch-diff/CHANGES:871905,871986
-subversion/branches/svnserve-logging/CHANGES:869828-870893
-subversion/branches/tc-issue-3334/CHANGES:874697-874773
-subversion/branches/tc-merge-notify/CHANGES:874017-874062
-subversion/branches/tc-resolve/CHANGES:874191-874239
-subversion/branches/tc_url_rev/CHANGES:874351-874483
-subversion/branches/tree-conflicts/CHANGES:868291-873154
-subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-subversion/trunk/CHANGES:836421-841355,875962-880126
+/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
+/subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
+/subversion/branches/1.6.x-issue3443/CHANGES:878597-879480
+/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
+/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
+/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
+/subversion/branches/1.6.x-r37622/CHANGES:877699-877993
+/subversion/branches/1.6.x-r37627/CHANGES:877704-877928
+/subversion/branches/1.6.x-r37857/CHANGES:877932-877936
+/subversion/branches/1.6.x-r37953/CHANGES:879809-880071
+/subversion/branches/1.6.x-r37988/CHANGES:878063-878897
+/subversion/branches/1.6.x-r38000/CHANGES:879083-879767
+/subversion/branches/1.6.x-r38222/CHANGES:878299-878891
+/subversion/branches/1.6.x-r38572/CHANGES:878661-878666
+/subversion/branches/1.6.x-r38799/CHANGES:878880-878917
+/subversion/branches/1.6.x-r38927/CHANGES:879002-879176
+/subversion/branches/1.6.x-r39557/CHANGES:879668-879907
+/subversion/branches/1.6.x-r39887/CHANGES:880024-880066
+/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
+/subversion/branches/diff-callbacks3/CHANGES:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
+/subversion/branches/double-delete/CHANGES:870511-872970
+/subversion/branches/file-externals/CHANGES:871779-873302
+/subversion/branches/fs-rep-sharing/CHANGES:869036-873803
+/subversion/branches/fsfs-pack/CHANGES:873717-874575
+/subversion/branches/gnome-keyring/CHANGES:870558-871410
+/subversion/branches/in-memory-cache/CHANGES:869829-871452
+/subversion/branches/issue-2843-dev/CHANGES:871432-874179
+/subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/CHANGES:873375-874084
+/subversion/branches/issue-3148-dev/CHANGES:875193-875204
+/subversion/branches/issue-3220-dev/CHANGES:872210-872226
+/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
+/subversion/branches/kwallet/CHANGES:870785-871314
+/subversion/branches/log-g-performance/CHANGES:870941-871032
+/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
+/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff/CHANGES:871905,871986
+/subversion/branches/svnserve-logging/CHANGES:869828-870893
+/subversion/branches/tc-issue-3334/CHANGES:874697-874773
+/subversion/branches/tc-merge-notify/CHANGES:874017-874062
+/subversion/branches/tc-resolve/CHANGES:874191-874239
+/subversion/branches/tc_url_rev/CHANGES:874351-874483
+/subversion/branches/tree-conflicts/CHANGES:868291-873154
+/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
+/subversion/trunk/CHANGES:836421-841355,875962-880126
Modified: subversion/tags/1.6.6/STATUS
URL: http://svn.apache.org/viewvc/subversion/tags/1.6.6/STATUS?rev=901971&r1=901970&r2=901971&view=diff
==============================================================================
--- subversion/tags/1.6.6/STATUS (original)
+++ subversion/tags/1.6.6/STATUS Fri Jan 22 03:39:03 2010
@@ -10,8 +10,8 @@
details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.6.10:
-=================
+Status of 1.6.6:
+================
Candidate changes:
Modified: subversion/tags/1.6.6/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/tags/1.6.6/subversion/include/svn_version.h?rev=901971&r1=901970&r2=901971&view=diff
==============================================================================
--- subversion/tags/1.6.6/subversion/include/svn_version.h (original)
+++ subversion/tags/1.6.6/subversion/include/svn_version.h Fri Jan 22 03:39:03 2010
@@ -66,7 +66,7 @@
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 10
+#define SVN_VER_PATCH 6
/** @deprecated Provided for backward compatibility with the 1.0 API. */
@@ -89,7 +89,7 @@
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG " (dev build)"
+#define SVN_VER_TAG " (r40053)"
/** Number tag: a string describing the version.
@@ -104,7 +104,7 @@
*
* Always change this at the same time as SVN_VER_TAG.
*/
-#define SVN_VER_NUMTAG "-dev"
+#define SVN_VER_NUMTAG ""
/** Revision number: The repository revision number of this release.
@@ -115,7 +115,7 @@
* When rolling a tarball, we automatically replace it with what we
* guess to be the correct revision number.
*/
-#define SVN_VER_REVISION 0
+#define SVN_VER_REVISION 40053
/* Version strings composed from the above definitions. */