On Sat, Apr 19, 2008 at 4:32 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>
> On Fri, Apr 18, 2008 at 3:42 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> >
> > On Fri, Apr 18, 2008 at 3:19 PM, Hyrum K. Wright
> > <hyrum_wright_at_mail.utexas.edu> wrote:
> > > Paul Burba wrote:
> > >
> > > > Fixed in r30668. This change (with the fix) is again nominated for
> > > backport.
> > >
> > > I'd like to roll RC 4 this weekend, probably tomorrow evening. I think the
> > > r30644 group is the only one which lacks review, and it should go into the
> > > RC.
> >
> > I'm still working on issue 3067, making some progress...though I just
> > got back from my lunch run and found a whole slew of test failures :-(
> > I'll keep at it.
> >
> > If I can tackle 3174 'Merge algorithm chokes on subtrees needing
> > special attention' I'll do that too, as it looks very closely related
> > to 3067.
> >
> > It would be helpful if some folks could look at 3067 and 3174 and
> > understand the problem. Not necessarily understand it enough to
> > propose a solution, but to offer an opinion as to whether these are
> > release blockers or not (I kinda think they are but maybe I'm overly
> > pessimistic).
>
> I am testing the --record-only changes proposed for backport. They
> merge cleanly to 1.5.x and the tests all pass. However, I then used
> the binaries with that change to do a manual test on the 1.5.x branch:
>
> svn merge --record-only -c30112 -c30286 https://svn.collab.net/repos/svn/trunk
>
> I was expecting this command the elide away the explicit mergeinfo on
> CHANGES. It did not, it just updated the root. I do not think this
> is a bug, because a merge of the same two revisions without
> --record-only also does not elide away the explicit mergeinfo. I
> would like to run a command like this and see it work. What are the
> other revisions I need to include for this to work correctly?
Mark,
Seems to work for me, the missing revs are shown below:
>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: 30732
Node Kind: directory
Schedule: normal
Last Changed Author: cauchy
Last Changed Rev: 30725
Last Changed Date: 2008-04-20 22:17:36 -0400 (Sun, 20 Apr 2008)
>svnversion
30732
# Backport the --record-only improvements
>svn merge http://svn.collab.net/repos/svn/trunk -c30644 -c30668 .
--- Merging r30644 into '.':
U subversion\libsvn_client\merge.c
--- Merging r30668 into '.':
G subversion\libsvn_client\merge.c
# <snip build of 1.5.x>
>svn pg svn:mergeinfo
/branches/1.5.x-r30215:30236,30238,30245,30288
/branches/svn-mergeinfo-enhancements:30122
/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-2919
4,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,293
97,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,29
493,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,2
9600,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,2998
6,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,301
59,30161-30162,30180-30181,30185,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30
342,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-3
0467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30633-30634,30644,
30668,30678
# Looking at the mergeinfo on 1.5.x and 1.5.x/CHANGES:
# r30112 and r30210 are applied only to 1.5.x/CHANGES
# r30583 r30591 and r30597 are applied only to 1.5.x
>svn pg svn:mergeinfo -R
. - /branches/1.5.x-r30215:30236,30238,30245,30288
/branches/svn-mergeinfo-enhancements:30122
/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-2919
4,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,293
97,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,29
493,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,2
9600,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,2998
6,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,301
59,30161-30162,30180-30181,30185,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285-30286,30297,30299,30304,30319-30321,30328,30335-30336,30340,30
342,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-3
0467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30633-30634,30644,
30668,30678
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,29
193-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-2
9392,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-2967
2,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-298
55,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,29
980,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,3
0145,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,30633-30634,3064
4,30668,30678
# So those five revisions should do it:
>svn merge http://svn.collab.net/repos/svn/trunk
-c30112,30210,30583,30591,30597 --record-only
>svn st
M .
M subversion\libsvn_client\merge.c
M CHANGES
>svn diff -N
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r30112,30210,30644,30668
Property changes on: CHANGES
___________________________________________________________________
Deleted: svn:mergeinfo
Reverse-merged /branches/1.5.x-r30215/CHANGES:r30236,30238,30245,30288
Reverse-merged /branches/svn-mergeinfo-enhancements/CHANGES:r30122
Reverse-merged
/trunk/CHANGES:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-2
9186,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-2957
8,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,296
63-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,29
835,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,2
9965,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-3044
9,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,305
73,30633-30634,30678
>svn diff CHANGES
Property changes on: CHANGES
___________________________________________________________________
Deleted: svn:mergeinfo
Reverse-merged /branches/1.5.x-r30215/CHANGES:r30236,30238,30245,30288
Reverse-merged /branches/svn-mergeinfo-enhancements/CHANGES:r30122
Reverse-merged
/trunk/CHANGES:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166-29170,29174,29176-2
9186,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-2957
8,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,296
63-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,29
835,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,2
9965,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-3044
9,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,305
73,30633-30634,30678
# All mergeinfo on CHANGES has elided to 1.5.x
>svn pg svn:mergeinfo -R
. - /branches/1.5.x-r30215:30236,30238,30245,30288
/branches/svn-mergeinfo-enhancements:30122
/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-2919
4,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,293
97,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,29
493,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,2
9600,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,2998
6,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,301
51,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-30
336,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-3
0464,30466-30467,30469-30474,30480,30482,30487,30489,30510,30516-30518,30520-30521,30523,30544,30546,30548,30551-30552,30567,30573,30583,30591,30597,30633-
30634,30644,30668,30678
That work for you?
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-22 07:41:31 CEST