Mark Phippard wrote:
> On Sat, Apr 12, 2008 at 2:22 AM, David Glasser <glasser_at_davidglasser.net> wrote:
>> I say this because with a clean 1.5.x checkout at r30560 and a clean
>> trunk svn from the same revision, I just get:
>>
>> glasser_at_filthy-assistant:~/Projects/Subversion/svn-1.5.x$ svn merge
>>
>> --accept theirs-full http://svn.collab.net/repos/svn/trunk/CHANGES
>> CHANGES
>> --- Merging r1283 through r30560 into 'CHANGES':
>> G CHANGES
>>
>> ... on the other hand, it appears to do nothing, not even change mergeinfo.
>
> We went through similar issues a couple weeks ago with Julian. The
> problem was that his 1.5.x branch was checked out before we updated to
> 1.5 and "cleaned" the repository. If you recall, all WC's needed to
> be re-checked out once we did that. CHANGES should not have any
> mergeinfo on it.
Actually, CHANGES should have mergeinfo on it.
hyrum-wrights-macbook-pro:svn-1.5.x Hyrum$ subversion/svn/svn diff -c30329
Index: CHANGES
===================================================================
--- CHANGES (revision 30328)
+++ CHANGES (revision 30329)
@@ -14,6 +14,7 @@
* Cyrus SASL support for ra_svn and svnserve (issue #1144)
- Minor new features and improvements:
+ * 'svn resolve' (with '--accept' option) replaces "resolved" (issue #2784)
* 'svn move file1 file2 ... dir' now moves the files into dir (issue #747)
* 'svn mkdir' and 'svn copy' now take '--parents' option (issue #1776)
* 'svn delete' now takes '--keep-local' to not remove working copy files
@@ -65,7 +66,6 @@
* 'svnserve' now takes '--config-file' option (r24119)
* 'mod_dav_svn' now uses Apache default mime-type for files (issue #2304)
* now accept "peg dates" (URL@{DATE}), behaving like peg revs (issue #2602)
- * new '--accept' option for resolving conflicts batch-style (issue #2784)
* easier to try out experimental ra_serf http:// access module
* select ra_neon vs ra_serf on a site-by-site basis in config (r25535)
* client-side post-commit processing now more efficient (issue #2607)
Property changes on: CHANGES
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/svn-mergeinfo-enhancements/CHANGES:r30122
Merged
/trunk/CHANGES:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29168,29174,29176-29186,29188-29189,29193-29194,29198-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29343,29345-29348,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29447,29449-29466,29468-29478,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29531,29533,29539-29540,29542,29544,29546,29551,29553,29556,29559,29565,29567-29569,29571-29578,29581,29583,29591,29594,29600,29603,29607,29611,29613-29614,29619,29623,29625-29626,29630-29631,29633-29634,29642,29645,29648,29650,29656,29659-29660,29663-29666,29671-29672,29677-29680,29692,29738-29739,29741-29744,29746,29751,29763,29767,29769-29770,29784,29786-29787,29797,29801,29815,29821,29824,29828,29835,29854-29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29
900,29914,29920,29922,29925,29930,29939-29940,29942,29950,29958,29962,29965,29967-29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30059,30061-30062,30067,30070,30074,30086,30098,30112,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30210,30233,30237,30239,30246,30249,30256
(Hmm, that's less than helpful. I expected to see only the revision merged
in r30329, not all the mergeinfo that was inherited, but now is explicit.
But, I digress...)
In r30329, I merged r30112 from trunk which touched both CHANGES and the release
notes. I didn't want to merge the release notes, because we no longer ship
www/ (with the exception of hacking.html) with the release tarballs. So I
cherry picked r30112 to CHANGES itself.
If it annoys us to have CHANGES modified for every commit to 1.5.x, does that
say something about how our users will feel?
-Hyrum
Received on 2008-04-12 16:06:59 CEST