You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/08/22 18:50:42 UTC

svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Author: stsp
Date: Mon Aug 22 16:50:42 2011
New Revision: 1160330

URL: http://svn.apache.org/viewvc?rev=1160330&view=rev
Log:
* CHANGES (1.7.x branch): Merge from trunk.

Modified:
    subversion/branches/1.7.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1160330&r1=1160329&r2=1160330&view=diff
==============================================================================
--- subversion/branches/1.7.x/CHANGES (original)
+++ subversion/branches/1.7.x/CHANGES Mon Aug 22 16:50:42 2011
@@ -17,7 +17,6 @@ the 1.6 release:  http://subversion.apac
 
   - Minor new features and improvements:
     * Better handling of HTTP redirects (issue #2779)
-    * make Serf the default DAV access method, if available (r875974)
     * Improved and much more consistent path handling (issue #2028, and others)
     * 'svnadmin load' rewrites changed revnums in mergeinfo (issue #3020)
     * Error message and help text improvements

Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 22 16:50:42 2011
@@ -0,0 +1,62 @@
+/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
+/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
+/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
+/subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
+/subversion/branches/1.7.x-r1155160/CHANGES:1158704-1159223
+/subversion/branches/1.7.x-r1159093/CHANGES:1159097-1159230
+/subversion/branches/atomic-revprop/CHANGES:965046-1000689
+/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
+/subversion/branches/diff-callbacks3/CHANGES:870059-870761
+/subversion/branches/diff-optimizations/CHANGES:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/CHANGES:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
+/subversion/branches/double-delete/CHANGES:870511-872970
+/subversion/branches/explore-wc/CHANGES:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/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/http-protocol-v2/CHANGES:874395-876041
+/subversion/branches/in-memory-cache/CHANGES:869829-871452
+/subversion/branches/integrate-cache-item-serialization/CHANGES:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/CHANGES:998649-998852
+/subversion/branches/integrate-compression-level/CHANGES:1068651-1072287
+/subversion/branches/integrate-io-improvements/CHANGES:1068684-1072297
+/subversion/branches/integrate-is-cachable/CHANGES:1072568-1074082
+/subversion/branches/integrate-partial-getter/CHANGES:1072558-1076552
+/subversion/branches/integrate-readline-speedup/CHANGES:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/CHANGES:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/CHANGES:1072541-1078213
+/subversion/branches/issue-2779-dev/CHANGES:965496-984198
+/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-3242-dev/CHANGES:879653-896436
+/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
+/subversion/branches/issue-3668-3669/CHANGES:1031000-1035744
+/subversion/branches/kwallet/CHANGES:870785-871314
+/subversion/branches/log-g-performance/CHANGES:870941-871032
+/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
+/subversion/branches/nfc-nfd-aware-client/CHANGES:870276,870376
+/subversion/branches/performance/CHANGES:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,
 1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/CHANGES:956579-1033052
+/subversion/branches/ra_serf-digest-authn/CHANGES:875693-876404
+/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
+/subversion/branches/revprop-packing/CHANGES:1143907,1143971,1143997,1144017,1144499,1144568
+/subversion/branches/subtree-mergeinfo/CHANGES:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/CHANGES:918519-934609
+/subversion/branches/svnpatch-diff/CHANGES:865738-876477
+/subversion/branches/svnraisetc/CHANGES:874709-875149
+/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/branches/uris-as-urls/CHANGES:1060426-1064427
+/subversion/trunk/CHANGES:1145993-1160329

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Stefan Sperling <st...@elego.de>.
On Mon, Aug 22, 2011 at 12:56:27PM -0500, Hyrum K Wright wrote:
> For 1.6.x, answering the question "when did we last merge stuff to
> CHANGES?" was very difficult, since the subtree mergeinfo was touched
> by all the subsequent bugfix merges to the branch.  Not a showstopper,
> of course, but a bit inconvenient (and the reason I started working on
> the ignore-mergeinfo problem a while back).
> 
> But if 1.7 solves the problem, and that's what I use for merging, I've
> no complaints.

Yes, a 1.7 client shouldn't update mergeinfo on CHANGES when we merge
bug fixes (unless those merges fix bugs in CHANGES :)

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Aug 22, 2011 at 12:56 PM, Hyrum K Wright
<hy...@wandisco.com> wrote:
> On Mon, Aug 22, 2011 at 12:00 PM, Stefan Sperling <st...@elego.de> wrote:
>> On Mon, Aug 22, 2011 at 11:52:06AM -0500, Hyrum K Wright wrote:
>>> Thank you for introducing subtree mergeinfo onto CHANGES.  :(
>>
>> I didn't do it! svn did!
>>
>> Jokes aside, there is subtree mergeinfo in CHANGES on 1.6.x.
>> I don't recall this being a problem. What exactly are you worried about?
>
> But there wasn't any yet on 1.7.x. :)  (I did the prior merges to the
> branch root, rather than directly on CHANGES.)
>
> For 1.6.x, answering the question "when did we last merge stuff to
> CHANGES?" was very difficult, since the subtree mergeinfo was touched
> by all the subsequent bugfix merges to the branch.  Not a showstopper,
> of course, but a bit inconvenient (and the reason I started working on
> the ignore-mergeinfo problem a while back).
>
> But if 1.7 solves the problem, and that's what I use for merging, I've
> no complaints.

For the record, my recent merges to 1.7.x haven't updated any
mergeinfo on CHANGES, so my concerns are unfounded.

-Hyrum


-- 

uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Aug 22, 2011 at 12:00 PM, Stefan Sperling <st...@elego.de> wrote:
> On Mon, Aug 22, 2011 at 11:52:06AM -0500, Hyrum K Wright wrote:
>> Thank you for introducing subtree mergeinfo onto CHANGES.  :(
>
> I didn't do it! svn did!
>
> Jokes aside, there is subtree mergeinfo in CHANGES on 1.6.x.
> I don't recall this being a problem. What exactly are you worried about?

But there wasn't any yet on 1.7.x. :)  (I did the prior merges to the
branch root, rather than directly on CHANGES.)

For 1.6.x, answering the question "when did we last merge stuff to
CHANGES?" was very difficult, since the subtree mergeinfo was touched
by all the subsequent bugfix merges to the branch.  Not a showstopper,
of course, but a bit inconvenient (and the reason I started working on
the ignore-mergeinfo problem a while back).

But if 1.7 solves the problem, and that's what I use for merging, I've
no complaints.

-Hyrum


-- 

uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Stefan Sperling <st...@elego.de>.
On Mon, Aug 22, 2011 at 11:52:06AM -0500, Hyrum K Wright wrote:
> Thank you for introducing subtree mergeinfo onto CHANGES.  :(

I didn't do it! svn did!

Jokes aside, there is subtree mergeinfo in CHANGES on 1.6.x.
I don't recall this being a problem. What exactly are you worried about?

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Mark Phippard <ma...@gmail.com>.
With a 1.7 client it should not matter :)

On Mon, Aug 22, 2011 at 12:52 PM, Hyrum K Wright
<hy...@wandisco.com>wrote:

> Thank you for introducing subtree mergeinfo onto CHANGES.  :(
>
> -Hyrum
>
> On Mon, Aug 22, 2011 at 11:50 AM,  <st...@apache.org> wrote:
> > Author: stsp
> > Date: Mon Aug 22 16:50:42 2011
> > New Revision: 1160330
> >
> > URL: http://svn.apache.org/viewvc?rev=1160330&view=rev
> > Log:
> > * CHANGES (1.7.x branch): Merge from trunk.
> >
> > Modified:
> >    subversion/branches/1.7.x/CHANGES   (contents, props changed)
> >
> > Modified: subversion/branches/1.7.x/CHANGES
> > URL:
> http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1160330&r1=1160329&r2=1160330&view=diff
> >
> ==============================================================================
> > --- subversion/branches/1.7.x/CHANGES (original)
> > +++ subversion/branches/1.7.x/CHANGES Mon Aug 22 16:50:42 2011
> > @@ -17,7 +17,6 @@ the 1.6 release:  http://subversion.apac
> >
> >   - Minor new features and improvements:
> >     * Better handling of HTTP redirects (issue #2779)
> > -    * make Serf the default DAV access method, if available (r875974)
> >     * Improved and much more consistent path handling (issue #2028, and
> others)
> >     * 'svnadmin load' rewrites changed revnums in mergeinfo (issue #3020)
> >     * Error message and help text improvements
> >
> > Propchange: subversion/branches/1.7.x/CHANGES
> >
> ------------------------------------------------------------------------------
> > --- svn:mergeinfo (added)
> > +++ svn:mergeinfo Mon Aug 22 16:50:42 2011
> > @@ -0,0 +1,62 @@
> > +/subversion/branches/1.5.x-r30215/CHANGES:870312
> > +/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
> > +/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
> > +/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
> > +/subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
> > +/subversion/branches/1.7.x-r1155160/CHANGES:1158704-1159223
> > +/subversion/branches/1.7.x-r1159093/CHANGES:1159097-1159230
> > +/subversion/branches/atomic-revprop/CHANGES:965046-1000689
> > +/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
> > +/subversion/branches/diff-callbacks3/CHANGES:870059-870761
> > +/subversion/branches/diff-optimizations/CHANGES:1031270-1037352
> > +/subversion/branches/diff-optimizations-bytes/CHANGES:1037353-1067789
> >
> +/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
> > +/subversion/branches/double-delete/CHANGES:870511-872970
> >
> +/subversion/branches/explore-wc/CHANGES:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
> > +/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/http-protocol-v2/CHANGES:874395-876041
> > +/subversion/branches/in-memory-cache/CHANGES:869829-871452
> >
> +/subversion/branches/integrate-cache-item-serialization/CHANGES:1068724-1068739
> > +/subversion/branches/integrate-cache-membuffer/CHANGES:998649-998852
> > +/subversion/branches/integrate-compression-level/CHANGES:1068651-1072287
> > +/subversion/branches/integrate-io-improvements/CHANGES:1068684-1072297
> > +/subversion/branches/integrate-is-cachable/CHANGES:1072568-1074082
> > +/subversion/branches/integrate-partial-getter/CHANGES:1072558-1076552
> > +/subversion/branches/integrate-readline-speedup/CHANGES:1072553-1072555
> >
> +/subversion/branches/integrate-stream-api-extensions/CHANGES:1068695-1072516
> > +/subversion/branches/integrate-txdelta-caching/CHANGES:1072541-1078213
> > +/subversion/branches/issue-2779-dev/CHANGES:965496-984198
> > +/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-3242-dev/CHANGES:879653-896436
> > +/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
> > +/subversion/branches/issue-3668-3669/CHANGES:1031000-1035744
> > +/subversion/branches/kwallet/CHANGES:870785-871314
> > +/subversion/branches/log-g-performance/CHANGES:870941-871032
> > +/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
> > +/subversion/branches/nfc-nfd-aware-client/CHANGES:870276,870376
> >
> +/subversion/branches/performance/CHANGES:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,
> >
>  1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
> > +/subversion/branches/py-tests-as-modules/CHANGES:956579-1033052
> > +/subversion/branches/ra_serf-digest-authn/CHANGES:875693-876404
> > +/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
> >
> +/subversion/branches/revprop-packing/CHANGES:1143907,1143971,1143997,1144017,1144499,1144568
> > +/subversion/branches/subtree-mergeinfo/CHANGES:876734-878766
> >
> +/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
> > +/subversion/branches/svn-patch-improvements/CHANGES:918519-934609
> > +/subversion/branches/svnpatch-diff/CHANGES:865738-876477
> > +/subversion/branches/svnraisetc/CHANGES:874709-875149
> > +/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/branches/uris-as-urls/CHANGES:1060426-1064427
> > +/subversion/trunk/CHANGES:1145993-1160329
> >
> >
> >
>
>
>
> --
>
> uberSVN: Apache Subversion Made Easy
> http://www.uberSVN.com/
>



-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Hyrum K Wright <hy...@wandisco.com>.
Thank you for introducing subtree mergeinfo onto CHANGES.  :(

-Hyrum

On Mon, Aug 22, 2011 at 11:50 AM,  <st...@apache.org> wrote:
> Author: stsp
> Date: Mon Aug 22 16:50:42 2011
> New Revision: 1160330
>
> URL: http://svn.apache.org/viewvc?rev=1160330&view=rev
> Log:
> * CHANGES (1.7.x branch): Merge from trunk.
>
> Modified:
>    subversion/branches/1.7.x/CHANGES   (contents, props changed)
>
> Modified: subversion/branches/1.7.x/CHANGES
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1160330&r1=1160329&r2=1160330&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/CHANGES (original)
> +++ subversion/branches/1.7.x/CHANGES Mon Aug 22 16:50:42 2011
> @@ -17,7 +17,6 @@ the 1.6 release:  http://subversion.apac
>
>   - Minor new features and improvements:
>     * Better handling of HTTP redirects (issue #2779)
> -    * make Serf the default DAV access method, if available (r875974)
>     * Improved and much more consistent path handling (issue #2028, and others)
>     * 'svnadmin load' rewrites changed revnums in mergeinfo (issue #3020)
>     * Error message and help text improvements
>
> Propchange: subversion/branches/1.7.x/CHANGES
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Mon Aug 22 16:50:42 2011
> @@ -0,0 +1,62 @@
> +/subversion/branches/1.5.x-r30215/CHANGES:870312
> +/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
> +/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
> +/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
> +/subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
> +/subversion/branches/1.7.x-r1155160/CHANGES:1158704-1159223
> +/subversion/branches/1.7.x-r1159093/CHANGES:1159097-1159230
> +/subversion/branches/atomic-revprop/CHANGES:965046-1000689
> +/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
> +/subversion/branches/diff-callbacks3/CHANGES:870059-870761
> +/subversion/branches/diff-optimizations/CHANGES:1031270-1037352
> +/subversion/branches/diff-optimizations-bytes/CHANGES:1037353-1067789
> +/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
> +/subversion/branches/double-delete/CHANGES:870511-872970
> +/subversion/branches/explore-wc/CHANGES:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
> +/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/http-protocol-v2/CHANGES:874395-876041
> +/subversion/branches/in-memory-cache/CHANGES:869829-871452
> +/subversion/branches/integrate-cache-item-serialization/CHANGES:1068724-1068739
> +/subversion/branches/integrate-cache-membuffer/CHANGES:998649-998852
> +/subversion/branches/integrate-compression-level/CHANGES:1068651-1072287
> +/subversion/branches/integrate-io-improvements/CHANGES:1068684-1072297
> +/subversion/branches/integrate-is-cachable/CHANGES:1072568-1074082
> +/subversion/branches/integrate-partial-getter/CHANGES:1072558-1076552
> +/subversion/branches/integrate-readline-speedup/CHANGES:1072553-1072555
> +/subversion/branches/integrate-stream-api-extensions/CHANGES:1068695-1072516
> +/subversion/branches/integrate-txdelta-caching/CHANGES:1072541-1078213
> +/subversion/branches/issue-2779-dev/CHANGES:965496-984198
> +/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-3242-dev/CHANGES:879653-896436
> +/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
> +/subversion/branches/issue-3668-3669/CHANGES:1031000-1035744
> +/subversion/branches/kwallet/CHANGES:870785-871314
> +/subversion/branches/log-g-performance/CHANGES:870941-871032
> +/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
> +/subversion/branches/nfc-nfd-aware-client/CHANGES:870276,870376
> +/subversion/branches/performance/CHANGES:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,
>  1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
> +/subversion/branches/py-tests-as-modules/CHANGES:956579-1033052
> +/subversion/branches/ra_serf-digest-authn/CHANGES:875693-876404
> +/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
> +/subversion/branches/revprop-packing/CHANGES:1143907,1143971,1143997,1144017,1144499,1144568
> +/subversion/branches/subtree-mergeinfo/CHANGES:876734-878766
> +/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
> +/subversion/branches/svn-patch-improvements/CHANGES:918519-934609
> +/subversion/branches/svnpatch-diff/CHANGES:865738-876477
> +/subversion/branches/svnraisetc/CHANGES:874709-875149
> +/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/branches/uris-as-urls/CHANGES:1060426-1064427
> +/subversion/trunk/CHANGES:1145993-1160329
>
>
>



-- 

uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/

Re: svn commit: r1160330 - /subversion/branches/1.7.x/CHANGES

Posted by Hyrum K Wright <hy...@wandisco.com>.
Thank you for introducing subtree mergeinfo onto CHANGES.  :(

-Hyrum

On Mon, Aug 22, 2011 at 11:50 AM,  <st...@apache.org> wrote:
> Author: stsp
> Date: Mon Aug 22 16:50:42 2011
> New Revision: 1160330
>
> URL: http://svn.apache.org/viewvc?rev=1160330&view=rev
> Log:
> * CHANGES (1.7.x branch): Merge from trunk.
>
> Modified:
>    subversion/branches/1.7.x/CHANGES   (contents, props changed)
>
> Modified: subversion/branches/1.7.x/CHANGES
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1160330&r1=1160329&r2=1160330&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/CHANGES (original)
> +++ subversion/branches/1.7.x/CHANGES Mon Aug 22 16:50:42 2011
> @@ -17,7 +17,6 @@ the 1.6 release:  http://subversion.apac
>
>   - Minor new features and improvements:
>     * Better handling of HTTP redirects (issue #2779)
> -    * make Serf the default DAV access method, if available (r875974)
>     * Improved and much more consistent path handling (issue #2028, and others)
>     * 'svnadmin load' rewrites changed revnums in mergeinfo (issue #3020)
>     * Error message and help text improvements
>
> Propchange: subversion/branches/1.7.x/CHANGES
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Mon Aug 22 16:50:42 2011
> @@ -0,0 +1,62 @@
> +/subversion/branches/1.5.x-r30215/CHANGES:870312
> +/subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
> +/subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
> +/subversion/branches/1.7.x-neon-default/CHANGES:1148803-1158680
> +/subversion/branches/1.7.x-r1152189/CHANGES:1152759-1154249
> +/subversion/branches/1.7.x-r1155160/CHANGES:1158704-1159223
> +/subversion/branches/1.7.x-r1159093/CHANGES:1159097-1159230
> +/subversion/branches/atomic-revprop/CHANGES:965046-1000689
> +/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
> +/subversion/branches/diff-callbacks3/CHANGES:870059-870761
> +/subversion/branches/diff-optimizations/CHANGES:1031270-1037352
> +/subversion/branches/diff-optimizations-bytes/CHANGES:1037353-1067789
> +/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
> +/subversion/branches/double-delete/CHANGES:870511-872970
> +/subversion/branches/explore-wc/CHANGES:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
> +/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/http-protocol-v2/CHANGES:874395-876041
> +/subversion/branches/in-memory-cache/CHANGES:869829-871452
> +/subversion/branches/integrate-cache-item-serialization/CHANGES:1068724-1068739
> +/subversion/branches/integrate-cache-membuffer/CHANGES:998649-998852
> +/subversion/branches/integrate-compression-level/CHANGES:1068651-1072287
> +/subversion/branches/integrate-io-improvements/CHANGES:1068684-1072297
> +/subversion/branches/integrate-is-cachable/CHANGES:1072568-1074082
> +/subversion/branches/integrate-partial-getter/CHANGES:1072558-1076552
> +/subversion/branches/integrate-readline-speedup/CHANGES:1072553-1072555
> +/subversion/branches/integrate-stream-api-extensions/CHANGES:1068695-1072516
> +/subversion/branches/integrate-txdelta-caching/CHANGES:1072541-1078213
> +/subversion/branches/issue-2779-dev/CHANGES:965496-984198
> +/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-3242-dev/CHANGES:879653-896436
> +/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
> +/subversion/branches/issue-3668-3669/CHANGES:1031000-1035744
> +/subversion/branches/kwallet/CHANGES:870785-871314
> +/subversion/branches/log-g-performance/CHANGES:870941-871032
> +/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
> +/subversion/branches/nfc-nfd-aware-client/CHANGES:870276,870376
> +/subversion/branches/performance/CHANGES:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,
>  1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
> +/subversion/branches/py-tests-as-modules/CHANGES:956579-1033052
> +/subversion/branches/ra_serf-digest-authn/CHANGES:875693-876404
> +/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
> +/subversion/branches/revprop-packing/CHANGES:1143907,1143971,1143997,1144017,1144499,1144568
> +/subversion/branches/subtree-mergeinfo/CHANGES:876734-878766
> +/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
> +/subversion/branches/svn-patch-improvements/CHANGES:918519-934609
> +/subversion/branches/svnpatch-diff/CHANGES:865738-876477
> +/subversion/branches/svnraisetc/CHANGES:874709-875149
> +/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/branches/uris-as-urls/CHANGES:1060426-1064427
> +/subversion/trunk/CHANGES:1145993-1160329
>
>
>



-- 

uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/