Mike,
Thanks for picking up the pieces here. A couple of thoughts:
* Since the magic rev for the release is r1128011, the tag should be
based on that revision, per HACKING (see [1])
* From that point, we should then merge to the tag the relavant
revisions from 1.6.x to make the tag match the release.
I feel that we should do the above, but would like to ensure I'm not
alone in that feeling.
-Hyrum
[1] http://subversion.apache.org/docs/community-guide/releasing.html#rolling-release
(the paragraph headed "Subversion Operations")
On Thu, Jun 2, 2011 at 8:59 AM, <cmpilato_at_apache.org> wrote:
> Author: cmpilato
> Date: Thu Jun 2 13:58:59 2011
> New Revision: 1130556
>
> URL: http://svn.apache.org/viewvc?rev=1130556&view=rev
> Log:
> Tagging 1.6.17 release with svn_version.h matching tarball.
>
> Added:
> subversion/tags/1.6.17/ (props changed)
> - copied from r1130555, subversion/branches/1.6.x/
> Modified:
> subversion/tags/1.6.17/subversion/include/svn_version.h
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- bugtraq:logregex (added)
> +++ bugtraq:logregex Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,2 @@
> +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+
> +(\d+)
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID%
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> bzr:file-ids =
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- bzr:revision-id-v3:trunk0 (added)
> +++ bzr:revision-id-v3:trunk0 Thu Jun 2 13:58:59 2011
> @@ -0,0 +1 @@
> +18228 jelmer_at_samba.org-20070720143618-d1n3ric4vua52zpm
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- bzr:revision-id:v3-trunk0 (added)
> +++ bzr:revision-id:v3-trunk0 Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,5 @@
> +20214 jelmer_at_samba.org-20071206202757-xopl18j270rt83ve
> +20235 jelmer_at_samba.org-20071209150938-eavv3u65qqwjjkzy
> +20236 jelmer_at_samba.org-20071209172359-x679msv2p5e5a4px
> +20244 jelmer_at_samba.org-20071209215808-36ku3dm56r11230a
> +20248 jelmer_at_samba.org-20071210031219-74vd608op3jvp2qe
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- bzr:revision-info (added)
> +++ bzr:revision-info Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,5 @@
> +timestamp: 2007-12-10 04:12:19.174999952 +0100
> +committer: Jelmer Vernooij <jelmer_at_samba.org>
> +properties:
> + branch-nick: trunk
> + rebase-of: jelmer_at_samba.org-20071210031219-kupghow41xajbh2k
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> subclipse:tags = 32486,trunk,/trunk,branch
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- svk:merge (added)
> +++ svk:merge Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,21 @@
> +40bec6f9-eef0-0310-8400-9b45a50af7ca:/local/trunk:90
> +422c9f7f-73e9-0310-916f-f579f4d99a6a:/local/pool-cleanup:1951
> +5fb2e21a-203d-0410-8290-957dc927bc9b:/local/trunk:31028
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ:153289
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ-tmp:153288
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-PHL:108970
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/SEA-BOS:108721
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/dav-to-neon:151584
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/propedit-urls:103714
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/props-in-subr:102459
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-bug:111919
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-textdelta:108713
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-real:113336
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-scratch:113335
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/test-chdir:148259
> +834019e9-2104-4f97-81ba-933cb999031a:/svn/trunk:108720
> +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/JFK-SFO:28628
> +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/NBR-PHL:28509
> +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/node-origins-bus:28431
> +ae6c956b-9dc6-0310-97b2-e73af4192982:/svn/local:8265
> +c9b7866f-f5e4-0310-b3ee-a2e1643c603f:/svn/local/new-auto-merge:10428
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- svn:ignore (added)
> +++ svn:ignore Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,44 @@
> +ChangeLog*
> +Makefile
> +config.cache
> +config.log
> +config.nice
> +config.status
> +configure
> +libtool
> +.gdb_history
> +*.orig
> +*.rej
> +TAGS
> +tags
> +neon
> +build-outputs.mk
> +autogen-standalone.mk
> +autom4te.cache
> +gen-make.opts
> +tests.log
> +db4-win32
> +db
> +*.o
> +*~
> +.*~
> +apr
> +apr-util
> +apr-iconv
> +Release
> +Debug
> +subversion_msvc.dsw
> +subversion_msvc.ncb
> +subversion_msvc.opt
> +subversion_msvc.plg
> +subversion_vcnet.sln
> +subversion_vcnet.ncb
> +subversion_vcnet.suo
> +mkmf.log
> +.project
> +.classpath
> +.cdtproject
> +.settings
> +.cproject
> +zlib
> +sqlite-amalgamation
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Thu Jun 2 13:58:59 2011
> @@ -0,0 +1,122 @@
> +/subversion/branches/1.5.x-r30215:870312
> +/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868
> +/subversion/branches/1.6.x-3242-partial-fixes:931279-932637
> +/subversion/branches/1.6.x-UNC-paths:876471-876545
> +/subversion/branches/1.6.x-dirent-basename:876130-876262
> +/subversion/branches/1.6.x-fsfs-begin-txn-deadlock:1063950-1104090
> +/subversion/branches/1.6.x-future-proof:880259-884209
> +/subversion/branches/1.6.x-issue-3242-partial:916088-923778
> +/subversion/branches/1.6.x-issue3242-reintegrate:954549-1001798
> +/subversion/branches/1.6.x-issue3303:950948-955336
> +/subversion/branches/1.6.x-issue3390:907042-927863
> +/subversion/branches/1.6.x-issue3432:878598-924025
> +/subversion/branches/1.6.x-issue3443:878597-879480
> +/subversion/branches/1.6.x-issue3469:945700-953293
> +/subversion/branches/1.6.x-issue3506:934622-955678
> +/subversion/branches/1.6.x-issue3506-init_once:935083-955686
> +/subversion/branches/1.6.x-issue3519:880376-889934
> +/subversion/branches/1.6.x-issue3573:906488-923765
> +/subversion/branches/1.6.x-issue3605:923668-923887
> +/subversion/branches/1.6.x-issue3623:952794-956049
> +/subversion/branches/1.6.x-issue3641:1072041-1125381
> +/subversion/branches/1.6.x-issue3646:957327-1002699
> +/subversion/branches/1.6.x-issue3648:964172-1001805
> +/subversion/branches/1.6.x-issue3650:1095508-1125384
> +/subversion/branches/1.6.x-issue3651:952977-954985
> +/subversion/branches/1.6.x-issue3654:953882-955338
> +/subversion/branches/1.6.x-issue3683:965785-988062
> +/subversion/branches/1.6.x-issue3700:991967-997279
> +/subversion/branches/1.6.x-issue3719:1075930-1096984
> +/subversion/branches/1.6.x-issue3727:1032967-1033213
> +/subversion/branches/1.6.x-issue3745:1032257-1033223
> +/subversion/branches/1.6.x-issue3816:1083880-1104106
> +/subversion/branches/1.6.x-issue3843:1084999-1104104
> +/subversion/branches/1.6.x-issue3845:1086922-1104099
> +/subversion/branches/1.6.x-issue3853:1091877-1103782
> +/subversion/branches/1.6.x-neon-expat:1127177-1127947
> +/subversion/branches/1.6.x-no-svn_uri:876360-876415
> +/subversion/branches/1.6.x-no-wcng-check:1022248-1035322
> +/subversion/branches/1.6.x-r1002094:1002741-1002773
> +/subversion/branches/1.6.x-r1024269:1024274-1035798
> +/subversion/branches/1.6.x-r1051744:1052424-1071327
> +/subversion/branches/1.6.x-r1053984:1072277-1104342
> +/subversion/branches/1.6.x-r1058269:1058271-1072344
> +/subversion/branches/1.6.x-r1068988:1070588-1072337
> +/subversion/branches/1.6.x-r1072084:1072274-1100234
> +/subversion/branches/1.6.x-r1104309:1104318-1124170
> +/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-r38836:878911-952818
> +/subversion/branches/1.6.x-r38927:879002-879176
> +/subversion/branches/1.6.x-r39019:879132-895676
> +/subversion/branches/1.6.x-r39109:879131
> +/subversion/branches/1.6.x-r39557:879668-879907
> +/subversion/branches/1.6.x-r39887:880024-880066
> +/subversion/branches/1.6.x-r40452:880530-890996
> +/subversion/branches/1.6.x-r877814:1003097-1033216
> +/subversion/branches/1.6.x-r878590:1104266-1104381
> +/subversion/branches/1.6.x-r879757:987687-999407
> +/subversion/branches/1.6.x-r880146:1071612-1072350
> +/subversion/branches/1.6.x-r889840:889888-890974
> +/subversion/branches/1.6.x-r891672:891676-923748
> +/subversion/branches/1.6.x-r892050:923839-923856
> +/subversion/branches/1.6.x-r896522:896528-897866
> +/subversion/branches/1.6.x-r898963:899874-915098
> +/subversion/branches/1.6.x-r905326:905545-923537
> +/subversion/branches/1.6.x-r907644:1033292-1033692
> +/subversion/branches/1.6.x-r917523:1035989-1104126
> +/subversion/branches/1.6.x-r923389:927445-929628
> +/subversion/branches/1.6.x-r926151:927922-929631
> +/subversion/branches/1.6.x-r933299:933310-934492
> +/subversion/branches/1.6.x-r935631:952683-955333
> +/subversion/branches/1.6.x-r935996:936212-952816
> +/subversion/branches/1.6.x-r979045:987702-997248
> +/subversion/branches/1.6.x-r980811:980813-987709
> +/subversion/branches/1.6.x-r981921:981922-997253
> +/subversion/branches/1.6.x-r991534:1003116-1033219
> +/subversion/branches/1.6.x-r997457:997808-1002642
> +/subversion/branches/1.6.x-svn_fs_commit_txn:1053419-1104095
> +/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
> +/subversion/branches/1.6.x-wc-ng-error:929379-929636
> +/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/http-protocol-v2:875632
> +/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-3242-dev:879762,880472,880579
> +/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/performance:982355,983766,984927
> +/subversion/branches/reintegrate-improvements:873853-874164
> +/subversion/branches/subtree-mergeinfo:876855
> +/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,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,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-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
> 9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,
> 879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880027,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1
> 000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036429,1036534,1036978,1037762,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063572-1063573,1063592,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1074572,1076730,1076759,1076826,1078954,1081255,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1102803,1103665,1104309,1125983,1125998,1126007,1126810,1130303
>
> Propchange: subversion/tags/1.6.17/
> ------------------------------------------------------------------------------
> tsvn:logwidthmarker = 78
>
> Modified: subversion/tags/1.6.17/subversion/include/svn_version.h
> URL: http://svn.apache.org/viewvc/subversion/tags/1.6.17/subversion/include/svn_version.h?rev=1130556&r1=1130555&r2=1130556&view=diff
> ==============================================================================
> --- subversion/tags/1.6.17/subversion/include/svn_version.h (original)
> +++ subversion/tags/1.6.17/subversion/include/svn_version.h Thu Jun 2 13:58:59 2011
> @@ -89,7 +89,7 @@ extern "C" {
> *
> * Always change this at the same time as SVN_VER_NUMTAG.
> */
> -#define SVN_VER_TAG " (under development)"
> +#define SVN_VER_TAG " (r1128011)"
>
>
> /** Number tag: a string describing the version.
> @@ -104,7 +104,7 @@ extern "C" {
> *
> * 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 @@ extern "C" {
> * 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 1128011
>
>
> /* Version strings composed from the above definitions. */
>
>
>
Received on 2011-06-02 17:53:17 CEST