You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Paul Burba <pt...@gmail.com> on 2008/12/09 16:26:16 UTC
Re: [Don't try to filter natural history from added mergeinfo
during reverse merges] ?Complete?
> Hi Paul,
>
> I was trying to understand [Don't try to filter natural history from
> added mergeinfo during reverse merges] block of revisions to vote for 1.5.x.
>
> I somehow could not see it seemed to fix the reversal of r32625 issue
> with the revision numbers recommended in STATUS.
>
> Will explore on it bit, in case you have thoughts let me know.
>
> I tried the following
> $/home/kamesh/1.5.x-build/bin/svn co -r32625
> http://svn.collab.net/repos/svn/branches/svnpatch-diff
> subversion-svnpatch-diff-r32625
> $cd subversion-svnpatch-diff-r32625
> $/home/kamesh/1.5.x-build/bin/svn merge -c-32625
> http://svn.collab.net/repos/svn/branches/svnpatch-diff
>
> With and without patch above merge does not delete 'svn:mergeinfo' on
> 'build.conf' which got added via r32625.
>
> With trunk binary this property gets deleted.
>
> Thanks
> With regards
> Kamesh Jayachandran
Sorry about that Kamesh, the dependencies between all these
merge-related backports can be a bit much at times...
For the specific example in
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142777
to be fully solved requires that the fix for issue #3323 'Mergeinfo
deleted by a merge should disappear' be present. I have nominated
that fix (r34547) and made notes about the relationship among the
r33026, r34547, and r34432* groups.
Thanks for spotting this,
Paul
* Which is unrelated to these other two, except that r34547 conflicts
if it hasn't been applied.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=981727
Re: [Don't try to filter natural history from added mergeinfo
during reverse merges] ?Complete?
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 9, 2008 at 12:01 PM, Kamesh Jayachandran <ka...@collab.net> wrote:
> Thanks, Will understand and vote for r34547 and this group tomorrow.
>
> I observed 'CHANGES' file not getting svn:mergeinfo set when I merge r30257
> using 1.5.4 client, but merging r33024 and r33026 sets the mergeinfo, will
> dig that too tomorrow.
Hi Kamesh,
The reason CHANGES's mergeinfo isn't updated is because prior to the
merge it already has mergeinfo from trunk for r30257:
C:\SVN\src-branch-1.5.x>svn pg svn:mergeinfo -v
http://svn.collab.net/repos/svn/branches/1.5.x/CHANGES@34613
Properties on 'http://svn.collab.net/repos/svn/branches/1.5.x/CHANGES':
svn:mergeinfo
/branches/1.5.x-issue3067/CHANGES:32110-32240
/branches/1.5.x-issue3157/CHANGES:32091-32101
/branches/1.5.x-issue3174/CHANGES:32104-32274
/branches/1.5.x-r30215/CHANGES:30236,30238,30245,30288
/branches/1.5.x-r30868/CHANGES:30877-30896
/branches/1.5.x-r31314/CHANGES:34402-34531
/branches/1.5.x-r31516/CHANGES:31518-31575
/branches/1.5.x-r32470/CHANGES:32472-32602
/branches/1.5.x-r32968/CHANGES:33699-33798
/branches/1.5.x-r33447/CHANGES:33453-33473
/branches/1.5.x-r33465/CHANGES:33467-33475
/branches/1.5.x-r33641/CHANGES:33806-33809
/branches/1.5.x-r34050-followups/CHANGES:34565-34612
/branches/1.5.x-r34487/CHANGES:34488-34507
/branches/1.5.x-ra_serf-backports/CHANGES:32280-32552
/branches/1.5.x-tests-pass/CHANGES:30851-30899
/branches/r30963-1.5.x/CHANGES:30982-31002
/branches/svn-mergeinfo-enhancements/CHANGES:30122
/trunk
vvvvvvvvvvv
/CHANGES:2-1281,29081-31786,31789-32286,32288,32290-32763,32771,
^^^^^^^^^^^
32790,32796,32798,32900,32911-32912,32968,32975,32977,33002,33013,33016,33022,33109,33112,33121,33136-33137,33144-33569,33641,33644,33693,33704,33775,33782,33788,33840,33866,33873-33874,34050-34051,34053,34171,34423,34487,34492,34494
Of course this begs the question, "why did it have mergeinfo for
r30257?" Turns out in r31424 Mark did a synch merge from
trunk/CHANGES to 1.5.x/CHANGES.
That's ok, but what is odd about this is that instead of collapsing
the trunk mergeinfo on 1.5.x/CHANGES into
'/trunk/CHANGES:29081-31423', it instead change the mergeinfo from
this:
/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,29191,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-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,29833,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-30286,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,30544,30546,30548,30551-30552,30567,30573,30629,30633-30634,30643-30644,30653,30663,30666,30668,30678,30684,30726,30741,30743,30751,30761-30762,30776-30777,30779,30785,30787,30820,30842-30844,30868,30871,30883,30888,30896,30905,30907,30922,30931,30937,30963-30964,30986,31004,31006,31018,31025,31031,31049,31056,31066,31081-31082,31107,31125-31126,31131,31138,31141,31145,31153,31155,31157,31162,31209,31243,31246,31
249-31251,31271,31273-31276,31292,31303,31313,31317,31334,31348,31396,31402,31407,31415
To this:
/trunk/CHANGES:
29083,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-29186,29188-29189,29191,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-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,29833,29835,29852,29854-29855,29857-29859,29868-29869,29876,29878,29883-29884,29894-31420
Seems the merge filled the gaps between r29894-r31420, but left all
the gaps between r29085-r29894. Since this merge was done before
1.5.0 was released I want to chalk it up to some bug that was later
fixed, though I don't recall one that would have this result. My
attempts to replicate Mark's synch merge with 1.5.4 and trunk don't
show any problem, instead the gaps in the mergeinfo are filled as
expected:
1.5.4>svn merge http://svn.collab.net/repos/svn/trunk/CHANGES CHANGES
-r0:31423 --accept theirs-full
--- Merging r29081 through r29084 into 'CHANGES':
U CHANGES
--- Merging r29885 through r29894 into 'CHANGES':
G CHANGES
--- Merging r29901 through r29913 into 'CHANGES':
G CHANGES
--- Merging r29931 through r29938 into 'CHANGES':
G CHANGES
--- Merging r31163 through r31208 into 'CHANGES':
G CHANGES
--- Merging r31210 through r31242 into 'CHANGES':
G CHANGES
--- Merging r31349 through r31395 into 'CHANGES':
G CHANGES
--- Merging r31416 through r31423 into 'CHANGES':
G CHANGES
1.5.4>svn pg svn:mergeinfo CHANGES
/branches/1.5.x-r30215/CHANGES:30236,30238,30245,30288
/branches/1.5.x-r30868/CHANGES:30877-30896
/branches/1.5.x-tests-pass/CHANGES:30851-30899
/branches/r30963-1.5.x/CHANGES:30982-31002
/branches/svn-mergeinfo-enhancements/CHANGES:30122
/trunk/CHANGES:29081-31423
trunk>svn merge http://svn.collab.net/repos/svn/trunk/CHANGES CHANGES
-r0:31423 --accept theirs-full
--- Merging r29081 through r29084 into 'CHANGES':
U CHANGES
--- Merging r29885 through r29894 into 'CHANGES':
G CHANGES
--- Merging r29901 through r29913 into 'CHANGES':
G CHANGES
--- Merging r29931 through r29938 into 'CHANGES':
G CHANGES
--- Merging r31163 through r31208 into 'CHANGES':
G CHANGES
--- Merging r31210 through r31242 into 'CHANGES':
G CHANGES
--- Merging r31349 through r31395 into 'CHANGES':
G CHANGES
--- Merging r31416 through r31423 into 'CHANGES':
G CHANGES
trunk>svn pg svn:mergeinfo -v CHANGES
Properties on 'CHANGES':
svn:mergeinfo
/branches/1.5.x-r30215/CHANGES:30236,30238,30245,30288
/branches/1.5.x-r30868/CHANGES:30877-30896
/branches/1.5.x-tests-pass/CHANGES:30851-30899
/branches/r30963-1.5.x/CHANGES:30982-31002
/branches/svn-mergeinfo-enhancements/CHANGES:30122
/trunk/CHANGES:29081-31423
So whatever caused this oddness has since been fixed.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982307
RE: [Don't try to filter natural history from added mergeinfo
during reverse merges] ?Complete?
Posted by Kamesh Jayachandran <ka...@collab.net>.
Thanks, Will understand and vote for r34547 and this group tomorrow.
I observed 'CHANGES' file not getting svn:mergeinfo set when I merge r30257 using 1.5.4 client, but merging r33024 and r33026 sets the mergeinfo, will dig that too tomorrow.
With regards
Kamesh Jayachandran
-----Original Message-----
From: Paul Burba [mailto:ptburba@gmail.com]
Sent: Tue 12/9/2008 9:56 PM
To: Kamesh Jayachandran
Cc: dev@subversion.tigris.org
Subject: Re: [Don't try to filter natural history from added mergeinfo during reverse merges] ?Complete?
> Hi Paul,
>
> I was trying to understand [Don't try to filter natural history from
> added mergeinfo during reverse merges] block of revisions to vote for 1.5.x.
>
> I somehow could not see it seemed to fix the reversal of r32625 issue
> with the revision numbers recommended in STATUS.
>
> Will explore on it bit, in case you have thoughts let me know.
>
> I tried the following
> $/home/kamesh/1.5.x-build/bin/svn co -r32625
> http://svn.collab.net/repos/svn/branches/svnpatch-diff
> subversion-svnpatch-diff-r32625
> $cd subversion-svnpatch-diff-r32625
> $/home/kamesh/1.5.x-build/bin/svn merge -c-32625
> http://svn.collab.net/repos/svn/branches/svnpatch-diff
>
> With and without patch above merge does not delete 'svn:mergeinfo' on
> 'build.conf' which got added via r32625.
>
> With trunk binary this property gets deleted.
>
> Thanks
> With regards
> Kamesh Jayachandran
Sorry about that Kamesh, the dependencies between all these
merge-related backports can be a bit much at times...
For the specific example in
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142777
to be fully solved requires that the fix for issue #3323 'Mergeinfo
deleted by a merge should disappear' be present. I have nominated
that fix (r34547) and made notes about the relationship among the
r33026, r34547, and r34432* groups.
Thanks for spotting this,
Paul
* Which is unrelated to these other two, except that r34547 conflicts
if it hasn't been applied.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=981755