On Sat, Apr 12, 2008 at 4:38 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> On Sat, Apr 12, 2008 at 12:56 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> >
> > On Sat, Apr 12, 2008 at 3:28 PM, Eric Gillespie <epg_at_pretzelnet.org> wrote:
> > > "Hyrum K. Wright" <hyrum_wright_at_mail.utexas.edu> writes:
> > >
> > > > I didn't merge the whole branch, because I only wanted the modifications
> > > > to CHANGES, not to the whole branch. Whether or not that was the right
> > > > decision can be debated, but, hey, it's version control: we can
> > > > always grab the other parts of r30112 later if we need them.
> > >
> > > Merging just one file from trunk is a perfectly valid use case;
> > > it's the natural way to maintain such a file. I don't think you
> > > did anything wrong.
> >
> > He didn't do anything wrong. However, if you do a single file merge
> > than we have to record mergeinfo for that so that Subversion correctly
> > knows that you did not merge the other files from that revision. If
> > you know that you will never want to merge the other files from that
> > same revision and you are annoyed by the extra mergeinfo that was
> > created, then you have to manually tell Subversion that you merged the
> > entire revision. In theory, I would expect a --record-only merge of
> > the revision to the proper parent folder to elide away the
> > file-specific mergeinfo. I am not sure if it actually does that or
> > not, in which case you might need to propdel the property from the
> > files in addition to the --record-only.
>
> What I'm confused about isn't that issue; it's how the initial
> transcript that Eric showed (which was incredibly slow, etc) differed
> so much from my attempt to reproduce.
>
> --dave
Dave / Eric,
Add me to the confused as to what you are both seeing.
Have either of you tried this again with RC3?
This is what I get with RC3:
>svn info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 30560
Node Kind: directory
Schedule: normal
Last Changed Author: arfrever
Last Changed Rev: 30560
Last Changed Date: 2008-04-11 20:09:42 -0400 (Fri, 11 Apr 2008)
>svnversion
30560
# Given the explicit mergeinfo on CHANGES at the start of the merge...
>svn pg svn:mergeinfo -R
. - /trunk:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,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,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,2993
0,29939-29940,29942,29950,29958,29962,29965,29967-29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30210,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30546,30548,30551-30552
CHANGES - /branches/1.5.x-r30215/CHANGES:30236,30238,30245,30288
/branches/svn-mergeinfo-enhancements/CHANGES:30122
/trunk/CHANGES:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,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,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,
29930,29939-29940,29942,29950,29958,29962,29965,29967-29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30112,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30210,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30546,30548,30551-30552
# ...we'd expect a *lot* of separate merges during a merge with no
revision ranges specified, as the merge "fills-in" all the holes, and
that is definitely what we get:
>svn merge --accept theirs-full
http://svn.collab.net/repos/svn/trunk/CHANGES CHANGES
--- Merging r29081 through r29084 into 'CHANGES':
U CHANGES
--- Merging r29090 into 'CHANGES':
G CHANGES
--- Merging r29092 through r29093 into 'CHANGES':
G CHANGES
--- Merging r29108 through r29110 into 'CHANGES':
G CHANGES
--- Merging r29112 through r29113 into 'CHANGES':
G CHANGES
--- Merging r29115 through r29116 into 'CHANGES':
G CHANGES
--- Merging r29118 through r29125 into 'CHANGES':
G CHANGES
--- Merging r29128 into 'CHANGES':
G CHANGES
--- Merging r29134 into 'CHANGES':
G CHANGES
--- Merging r29151 through r29152 into 'CHANGES':
G CHANGES
--- Merging r29165 into 'CHANGES':
G CHANGES
--- Merging r29171 through r29173 into 'CHANGES':
G CHANGES
--- Merging r29175 into 'CHANGES':
G CHANGES
--- Merging r29187 into 'CHANGES':
G CHANGES
--- Merging r29190 through r29192 into 'CHANGES':
G CHANGES
--- Merging r29195 through r29197 into 'CHANGES':
G CHANGES
--- Merging r29207 into 'CHANGES':
G CHANGES
--- Merging r29252 through r29253 into 'CHANGES':
G CHANGES
--- Merging r29257 through r29260 into 'CHANGES':
G CHANGES
--- Merging r29262 through r29266 into 'CHANGES':
G CHANGES
--- Merging r29274 through r29276 into 'CHANGES':
G CHANGES
--- Merging r29278 through r29279 into 'CHANGES':
G CHANGES
--- Merging r29282 through r29283 into 'CHANGES':
G CHANGES
--- Merging r29285 through r29286 into 'CHANGES':
G CHANGES
--- Merging r29304 into 'CHANGES':
G CHANGES
--- Merging r29308 into 'CHANGES':
G CHANGES
--- Merging r29344 into 'CHANGES':
G CHANGES
--- Merging r29349 through r29357 into 'CHANGES':
G CHANGES
--- Merging r29380 into 'CHANGES':
G CHANGES
--- Merging r29393 through r29396 into 'CHANGES':
G CHANGES
--- Merging r29398 into 'CHANGES':
G CHANGES
--- Merging r29400 into 'CHANGES':
G CHANGES
--- Merging r29402 through r29408 into 'CHANGES':
G CHANGES
--- Merging r29410 through r29411 into 'CHANGES':
G CHANGES
--- Merging r29413 into 'CHANGES':
G CHANGES
--- Merging r29416 into 'CHANGES':
G CHANGES
--- Merging r29424 into 'CHANGES':
G CHANGES
--- Merging r29427 through r29428 into 'CHANGES':
G CHANGES
--- Merging r29430 through r29432 into 'CHANGES':
G CHANGES
--- Merging r29435 into 'CHANGES':
G CHANGES
--- Merging r29448 into 'CHANGES':
G CHANGES
--- Merging r29467 into 'CHANGES':
G CHANGES
--- Merging r29479 through r29481 into 'CHANGES':
G CHANGES
--- Merging r29483 into 'CHANGES':
G CHANGES
--- Merging r29485 into 'CHANGES':
G CHANGES
--- Merging r29488 into 'CHANGES':
G CHANGES
--- Merging r29490 into 'CHANGES':
G CHANGES
--- Merging r29492 into 'CHANGES':
G CHANGES
--- Merging r29494 through r29495 into 'CHANGES':
G CHANGES
--- Merging r29497 into 'CHANGES':
G CHANGES
--- Merging r29499 through r29507 into 'CHANGES':
G CHANGES
--- Merging r29509 through r29526 into 'CHANGES':
G CHANGES
--- Merging r29529 through r29530 into 'CHANGES':
G CHANGES
--- Merging r29532 into 'CHANGES':
G CHANGES
--- Merging r29534 through r29538 into 'CHANGES':
G CHANGES
--- Merging r29541 into 'CHANGES':
G CHANGES
--- Merging r29543 into 'CHANGES':
G CHANGES
--- Merging r29545 into 'CHANGES':
G CHANGES
--- Merging r29547 through r29550 into 'CHANGES':
G CHANGES
--- Merging r29552 into 'CHANGES':
G CHANGES
--- Merging r29554 through r29555 into 'CHANGES':
G CHANGES
--- Merging r29557 through r29558 into 'CHANGES':
G CHANGES
--- Merging r29560 through r29564 into 'CHANGES':
G CHANGES
--- Merging r29566 into 'CHANGES':
G CHANGES
--- Merging r29570 into 'CHANGES':
G CHANGES
--- Merging r29579 through r29580 into 'CHANGES':
G CHANGES
--- Merging r29582 into 'CHANGES':
G CHANGES
--- Merging r29584 through r29590 into 'CHANGES':
G CHANGES
--- Merging r29592 through r29593 into 'CHANGES':
G CHANGES
--- Merging r29595 through r29599 into 'CHANGES':
G CHANGES
--- Merging r29601 through r29602 into 'CHANGES':
G CHANGES
--- Merging r29604 through r29606 into 'CHANGES':
G CHANGES
--- Merging r29608 through r29610 into 'CHANGES':
G CHANGES
--- Merging r29612 into 'CHANGES':
G CHANGES
--- Merging r29615 through r29618 into 'CHANGES':
G CHANGES
--- Merging r29620 through r29622 into 'CHANGES':
G CHANGES
--- Merging r29624 into 'CHANGES':
G CHANGES
--- Merging r29627 through r29629 into 'CHANGES':
G CHANGES
--- Merging r29632 into 'CHANGES':
G CHANGES
--- Merging r29635 through r29641 into 'CHANGES':
G CHANGES
--- Merging r29643 through r29644 into 'CHANGES':
G CHANGES
--- Merging r29646 through r29647 into 'CHANGES':
G CHANGES
--- Merging r29649 into 'CHANGES':
G CHANGES
--- Merging r29651 through r29655 into 'CHANGES':
G CHANGES
--- Merging r29657 through r29658 into 'CHANGES':
G CHANGES
--- Merging r29661 through r29662 into 'CHANGES':
G CHANGES
--- Merging r29667 through r29670 into 'CHANGES':
G CHANGES
--- Merging r29673 through r29676 into 'CHANGES':
G CHANGES
--- Merging r29681 through r29691 into 'CHANGES':
G CHANGES
--- Merging r29693 through r29737 into 'CHANGES':
G CHANGES
--- Merging r29740 into 'CHANGES':
G CHANGES
--- Merging r29745 into 'CHANGES':
G CHANGES
--- Merging r29747 through r29750 into 'CHANGES':
G CHANGES
--- Merging r29752 through r29762 into 'CHANGES':
G CHANGES
--- Merging r29764 through r29766 into 'CHANGES':
G CHANGES
--- Merging r29768 into 'CHANGES':
G CHANGES
--- Merging r29771 through r29783 into 'CHANGES':
G CHANGES
--- Merging r29785 into 'CHANGES':
G CHANGES
--- Merging r29788 through r29796 into 'CHANGES':
G CHANGES
--- Merging r29798 through r29800 into 'CHANGES':
G CHANGES
--- Merging r29802 through r29814 into 'CHANGES':
G CHANGES
--- Merging r29816 through r29820 into 'CHANGES':
G CHANGES
--- Merging r29822 through r29823 into 'CHANGES':
G CHANGES
--- Merging r29825 through r29827 into 'CHANGES':
G CHANGES
--- Merging r29829 through r29834 into 'CHANGES':
G CHANGES
--- Merging r29836 through r29851 into 'CHANGES':
G CHANGES
--- Merging r29853 into 'CHANGES':
G CHANGES
--- Merging r29856 into 'CHANGES':
G CHANGES
--- Merging r29860 through r29867 into 'CHANGES':
G CHANGES
--- Merging r29870 through r29875 into 'CHANGES':
G CHANGES
--- Merging r29877 into 'CHANGES':
G CHANGES
--- Merging r29879 through r29882 into 'CHANGES':
G CHANGES
--- Merging r29885 through r29894 into 'CHANGES':
G CHANGES
--- Merging r29896 through r29897 into 'CHANGES':
G CHANGES
--- Merging r29899 into 'CHANGES':
G CHANGES
--- Merging r29901 through r29913 into 'CHANGES':
G CHANGES
--- Merging r29915 through r29919 into 'CHANGES':
G CHANGES
--- Merging r29921 into 'CHANGES':
G CHANGES
--- Merging r29923 through r29924 into 'CHANGES':
G CHANGES
--- Merging r29926 through r29929 into 'CHANGES':
G CHANGES
--- Merging r29931 through r29938 into 'CHANGES':
G CHANGES
--- Merging r29941 into 'CHANGES':
G CHANGES
--- Merging r29943 through r29949 into 'CHANGES':
G CHANGES
--- Merging r29951 through r29957 into 'CHANGES':
G CHANGES
--- Merging r29959 through r29961 into 'CHANGES':
G CHANGES
--- Merging r29963 through r29964 into 'CHANGES':
G CHANGES
--- Merging r29966 into 'CHANGES':
G CHANGES
--- Merging r29969 through r29979 into 'CHANGES':
G CHANGES
--- Merging r29981 through r29985 into 'CHANGES':
G CHANGES
--- Merging r29987 through r29993 into 'CHANGES':
G CHANGES
--- Merging r29998 through r30003 into 'CHANGES':
G CHANGES
--- Merging r30005 through r30008 into 'CHANGES':
G CHANGES
--- Merging r30010 through r30019 into 'CHANGES':
G CHANGES
--- Merging r30021 through r30029 into 'CHANGES':
G CHANGES
--- Merging r30031 through r30049 into 'CHANGES':
G CHANGES
--- Merging r30051 through r30052 into 'CHANGES':
G CHANGES
--- Merging r30055 through r30058 into 'CHANGES':
G CHANGES
--- Merging r30060 into 'CHANGES':
G CHANGES
--- Merging r30063 through r30066 into 'CHANGES':
G CHANGES
--- Merging r30068 through r30069 into 'CHANGES':
G CHANGES
--- Merging r30071 through r30073 into 'CHANGES':
G CHANGES
--- Merging r30075 through r30085 into 'CHANGES':
G CHANGES
--- Merging r30087 through r30097 into 'CHANGES':
G CHANGES
--- Merging r30099 through r30100 into 'CHANGES':
G CHANGES
--- Merging r30102 through r30111 into 'CHANGES':
G CHANGES
--- Merging r30113 through r30116 into 'CHANGES':
G CHANGES
--- Merging r30118 through r30123 into 'CHANGES':
G CHANGES
--- Merging r30125 through r30128 into 'CHANGES':
G CHANGES
--- Merging r30131 through r30136 into 'CHANGES':
G CHANGES
--- Merging r30138 through r30144 into 'CHANGES':
G CHANGES
--- Merging r30146 through r30150 into 'CHANGES':
G CHANGES
--- Merging r30152 through r30158 into 'CHANGES':
G CHANGES
--- Merging r30160 into 'CHANGES':
G CHANGES
--- Merging r30163 through r30179 into 'CHANGES':
G CHANGES
--- Merging r30182 through r30184 into 'CHANGES':
G CHANGES
--- Merging r30186 through r30209 into 'CHANGES':
G CHANGES
--- Merging r30211 through r30232 into 'CHANGES':
G CHANGES
--- Merging r30234 through r30236 into 'CHANGES':
G CHANGES
--- Merging r30238 into 'CHANGES':
G CHANGES
--- Merging r30240 through r30245 into 'CHANGES':
G CHANGES
--- Merging r30247 through r30248 into 'CHANGES':
G CHANGES
--- Merging r30250 through r30255 into 'CHANGES':
G CHANGES
--- Merging r30257 through r30277 into 'CHANGES':
G CHANGES
--- Merging r30280 into 'CHANGES':
G CHANGES
--- Merging r30282 through r30284 into 'CHANGES':
G CHANGES
--- Merging r30286 through r30296 into 'CHANGES':
G CHANGES
--- Merging r30298 into 'CHANGES':
G CHANGES
--- Merging r30300 through r30303 into 'CHANGES':
G CHANGES
--- Merging r30305 through r30318 into 'CHANGES':
G CHANGES
--- Merging r30322 through r30327 into 'CHANGES':
G CHANGES
--- Merging r30329 through r30334 into 'CHANGES':
G CHANGES
--- Merging r30337 through r30339 into 'CHANGES':
G CHANGES
--- Merging r30341 into 'CHANGES':
G CHANGES
--- Merging r30343 through r30346 into 'CHANGES':
G CHANGES
--- Merging r30348 through r30361 into 'CHANGES':
G CHANGES
--- Merging r30363 through r30367 into 'CHANGES':
G CHANGES
--- Merging r30369 through r30372 into 'CHANGES':
G CHANGES
--- Merging r30374 into 'CHANGES':
G CHANGES
--- Merging r30376 through r30377 into 'CHANGES':
G CHANGES
--- Merging r30379 into 'CHANGES':
G CHANGES
--- Merging r30381 through r30391 into 'CHANGES':
G CHANGES
--- Merging r30393 through r30401 into 'CHANGES':
G CHANGES
--- Merging r30403 through r30406 into 'CHANGES':
G CHANGES
--- Merging r30410 through r30411 into 'CHANGES':
G CHANGES
--- Merging r30413 through r30425 into 'CHANGES':
G CHANGES
--- Merging r30427 into 'CHANGES':
G CHANGES
--- Merging r30429 through r30430 into 'CHANGES':
G CHANGES
--- Merging r30432 through r30438 into 'CHANGES':
G CHANGES
--- Merging r30445 through r30447 into 'CHANGES':
G CHANGES
--- Merging r30450 through r30452 into 'CHANGES':
G CHANGES
--- Merging r30454 into 'CHANGES':
G CHANGES
--- Merging r30456 through r30459 into 'CHANGES':
G CHANGES
--- Merging r30461 into 'CHANGES':
G CHANGES
--- Merging r30465 into 'CHANGES':
G CHANGES
--- Merging r30468 into 'CHANGES':
G CHANGES
--- Merging r30475 through r30479 into 'CHANGES':
G CHANGES
--- Merging r30481 into 'CHANGES':
G CHANGES
--- Merging r30483 through r30486 into 'CHANGES':
G CHANGES
--- Merging r30488 into 'CHANGES':
G CHANGES
--- Merging r30490 through r30509 into 'CHANGES':
G CHANGES
--- Merging r30511 through r30515 into 'CHANGES':
G CHANGES
--- Merging r30519 into 'CHANGES':
G CHANGES
--- Merging r30522 into 'CHANGES':
G CHANGES
--- Merging r30524 through r30545 into 'CHANGES':
G CHANGES
--- Merging r30547 into 'CHANGES':
G CHANGES
--- Merging r30549 through r30550 into 'CHANGES':
G CHANGES
--- Merging r30553 through r30590 into 'CHANGES':
G CHANGES
>svn st
MM CHANGES
>svn diff
Index: CHANGES
===================================================================
--- CHANGES (revision 30560)
+++ CHANGES (working copy)
@@ -10,50 +10,47 @@
...<snip text diff>...
Property changes on: CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/CHANGES:r1283-29084,29090,29092-29093,29108-29110,29112-29113,29115-29116,29118-29125,29128,29134,29151-29152,29165,29171-29173,29175,29187,29190-29192,29195-29197,29207,29252-29253,29257-29260,29262-29266,29274-29276,29278-29279,29282-29283,29285-29286,29304,29308,29344,29349-29357,29380,29393-29396,29398,29400,29402-29408,29410-29411,29413,29416,29424,29427-29428,29430-29432,29435,29448,29467,29479-29481,29483,29485,29488,29490,29492,29494-29495,29497,29499-29507,29509-29526,29529-29530,29532,29534-29538,29541,29543,29545,29547-29550,29552,29554-29555,29557-29558,29560-29564,29566,29570,29579-29580,29582,29584-29590,29592-29593,29595-29599,29601-29602,29604-29606,29608-29610,29612,29615-29618,29620-29622,29624,29627-29629,29632,29635-29641,29643-29644,29646-29647,29649,29651-29655,29657-29658,29661-29662,29667-29670,29673-29676,29681-29691,29693-29737,29740,29745,29747-29750,29752-29762,29764-29766,29768,29771-29783,29785,29788-29796,29798-29800,29802-29814,29816-29820,29822-29823,29825-29
827,29829-29834,29836-29851,29853,29856,29860-29867,29870-29875,29877,29879-29882,29885-29894,29896-29897,29899,29901-29913,29915-29919,29921,29923-29924,29926-29929,29931-29938,29941,29943-29949,29951-29957,29959-29961,29963-29964,29966,29969-29979,29981-29985,29987-29993,29998-30003,30005-30008,30010-30019,30021-30029,30031-30049,30051-30052,30055-30058,30060,30063-30066,30068-30069,30071-30073,30075-30085,30087-30097,30099-30100,30102-30111,30113-30116,30118-30123,30125-30128,30131-30136,30138-30144,30146-30150,30152-30158,30160,30163-30179,30182-30184,30186-30209,30211-30232,30234-30236,30238,30240-30245,30247-30248,30250-30255,30257-30277,30280,30282-30284,30286-30296,30298,30300-30303,30305-30318,30322-30327,30329-30334,30337-30339,30341,30343-30346,30348-30361,30363-30367,30369-30372,30374,30376-30377,30379,30381-30391,30393-30401,30403-30406,30410-30411,30413-30425,30427,30429-30430,30432-30438,30445-30447,30450-30452,30454,30456-30459,30461,30465,30468,30475-30479,30481,30483-30486,30488,30490-30509
,3
0511-30515,30519,30522,30524-30545,30547,30549-30550,30553-30590
>svn pg svn:mergeinfo -R
. - /trunk:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,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,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29922,29925,2993
0,29939-29940,29942,29950,29958,29962,29965,29967-29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30053-30054,30059,30061-30062,30067,30070,30074,30086,30098,30101,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,30180-30181,30185,30210,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285,30297,30299,30304,30319-30321,30328,30335-30336,30340,30342,30347,30362,30368,30373,30375,30378,30380,30392,30402,30407-30409,30412,30426,30428,30431,30439-30444,30448-30449,30453,30455,30460,30462-30464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30546,30548,30551-30552
CHANGES - /branches/1.5.x-r30215/CHANGES:30236,30238,30245,30288
/branches/svn-mergeinfo-enhancements/CHANGES:30122
/trunk/CHANGES:1283-30590
^^^^
Bah, the mergeinfo '/trunk/CHANGES:1283-29080' is yet another example
of self-referential mergeinfo (Issue #3157), but at least it's
semantically correct.
Despite the self-referential mergeinfo and all the separate merges,
this merge looks basically correct. We are after all asking to cherry
harvest a subtree after a long period of cherry picking. Could you
show me what the mergeinfo on CHANGES is before (obviously we should
all see the same thing here) and after you try the merge? I'm at a
loss to explain what you two are seeing.
Paul
Received on 2008-04-15 03:30:51 CEST