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/04/08 14:16:00 UTC
Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
On Mon, Apr 7, 2008 at 5:32 AM, <ar...@tigris.org> wrote:
> Author: arfrever
> Date: Mon Apr 7 02:32:05 2008
> New Revision: 30390
>
> Log:
> Fix svn:mergeinfo on the 1.5.x branch.
>
> Modified:
> branches/1.5.x/ (props changed)
Hi Arfrever,
Why was this change made? The log message is rather vague...
Was there any discussion in IRC or on dev about it (my apologies if I
missed it)?
>svn diff http://svn.collab.net/repos/svn/branches/1.5.x -r30389:30390
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /trunk:r30286
Reverse-merged /branches/1.5.x-r30215:r30236,30238,30245,30288
Merged /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-29343,29345-29348,29358-2937
9,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-294
87,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,29
583,29591,29594,29600,29603,29607,29611,29613-29614,29619,29623,29625-29626,29630-29631,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,2
9677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,
29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-29940,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050
,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
>svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30389
/branches/1.5.x-r30215:30236,30238,30245,30288
/trunk:29167-29170,29326,29633,29645,29665-29666,29741,29767,29786,29815,29852,29854,29857,29922,29965,29967,30053,30059,30101,30129,30161,30180-30181,3021
0,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,303
75,30378,30380
>svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30390
/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,30210,30233,30237,30239,30246,30249,30256,30278-30279,30281,30285,30297,30299,30304,30319-30321,30328,30335-30336,30340,30
342,30347,30362,30368,30373,30375,30378,30380
Just trying to understand what is happening here.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by David Glasser <gl...@davidglasser.net>.
Not that the things you note below aren't probably real bugs and all,
but, in a 1.5.x r30348 wc,
$ svn merge --reintegrate $SR/branches/1.5.x-r30215@30348
appears to DTRT for me.
Doing a 'svn diff -r30349' in the resulting wc shows me changes to
STATUS, as well as the following mergeinfo changes:
Property changes on: CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /branches/1.5.x-r30215/CHANGES:r30236,30238,30245,30288
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-29940,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185,30215,30221,30225-30226,30230,30243
Merged /branches/1.5.x-r30215:r30222-30235,30237,30239-30244,30246-30287,30289-30348
Merged /branches/svn-mergeinfo-enhancements:r30045-30214
I don't know if the reintegrate-produce mergeinfo or the
r30349-committed mergeinfo is better.
--dave
On Wed, Apr 9, 2008 at 7:53 AM, C. Michael Pilato <cm...@collab.net> wrote:
> Hyrum K. Wright wrote:
>
> >
> > > Hyrum - any thoughts as to what happened? I recall in IRC you were
> > > had some questions about how exactly to merge the 1.5.x-r30215 branch
> > > to 1.5.x. What did you ultimately end up doing?
> > >
> >
> > After a couple of failed attempts, the command I ultimately ended up
> running was:
> > $ svn merge -c 30236,30238,30245,30288
> https://svn.collab.net/repos/svn/branches/1.5.x-r30215
> >
>
> I cut the 1.5.x-r30215 branch from the 1.5.x branch. You should have
> needed only to do:
>
> svn merge https://svn.collab.net/repos/svn/branches/1.5.x-r30215 \
> /path/to/subversion-1.5.x
>
> I tried to replay this scenario (which ought to be time-safe, right?), but
> I got an error:
>
> $ cd projects/subversion-1.5.x
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 .
> subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
> svn: File not found: revision 30447, path '/branches/1.5.x-r30215'
> $
>
> 'svn help merge' contains this:
>
> [...]
> 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
> [...]
> 3. In the third form, SOURCE can be either a URL or a working copy
> path (in which case its corresponding URL is used). SOURCE (in
> revision REV) is compared as it existed between revisions N and M
> for each revision range provided. If REV is not specified, HEAD
> is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
> does the reverse: '-r M:<M-1>'. If no revision ranges are
> specified, the default range of 0:HEAD is used. Multiple '-c'
> and/or '-r' instances may be specified, and mixing of forward
> and reverse ranges is allowed.
>
> Maybe I got bit by the default range of 0:HEAD? That's a stupid default,
> by the way, and inconsistent with our policy of allowing specified peg
> revisions dictate the upper bound on the operative revision range. But
> anyway, I tried with the obvious workaround:
>
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 . \
> -r0:30348
> subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
> svn: Working copy path 'CHANGES' does not exist in repository
> $
>
> Ooookay. Well, I'll use 'svn log' to find a real range, then.
>
> $ svn log -q --stop-on-copy \
> http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 \
> | grep '^r' | tail -1
> r30222 | cmpilato | 2008-04-03 13:38:30 -0400 (Thu, 03 Apr 2008)
> $
>
> (Sidebar: 'svn help log' indicates that HEAD:1 is the default revision
> range even when a peg revision to the URL is supplied. Clearly, that's a
> lie. How many bugs are we up to now?)
>
> Anyway, back to using a real range for this merge:
>
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
> -r30222:30348 .
> --- Merging r30223 through r30348 into '.':
> U subversion/include/svn_client.h
> U subversion/libsvn_client/util.c
> U subversion/libsvn_client/mergeinfo.c
> U subversion/tests/cmdline/mergeinfo_tests.py
> U subversion/tests/cmdline/svntest/actions.py
> D subversion/tests/cmdline/svntest/parsers.py
> U subversion/svn/cl.h
> U subversion/svn/mergeinfo-cmd.c
> U subversion/svn/util.c
> U subversion/svn/main.c
> G .
> $ svn st
> M .
> M subversion/include/svn_client.h
> M subversion/libsvn_client/util.c
> M subversion/libsvn_client/mergeinfo.c
> M subversion/tests/cmdline/mergeinfo_tests.py
> D subversion/tests/cmdline/svntest/parsers.py
> M subversion/tests/cmdline/svntest/actions.py
> M subversion/svn/cl.h
> M subversion/svn/mergeinfo-cmd.c
> M subversion/svn/util.c
> M subversion/svn/main.c
> M CHANGES
> $ svn diff --depth empty
>
>
> Property changes on: .
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Reverse-merged
> /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-2994
>
> 0,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
> Reverse-merged /branches/svn-mergeinfo-enhancements:r30122
> Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
> Merged /branches/1.5.x-r30215:r30223-30348
> Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
> $
>
> Oh boy. That's all so very not good. My guess? The svn:mergeinfo
> property actually stored on the backport branch first blew away the one
> stored on in the 1.5.x branch, and then was modified to include the current
> merge operation.
>
>
>
> --
> C. Michael Pilato <cm...@collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Apr 10, 2008 at 8:41 AM, C. Michael Pilato <cm...@collab.net> wrote:
>
> Paul Burba wrote:
>
> > On Wed, Apr 9, 2008 at 5:34 PM, C. Michael Pilato <cm...@collab.net>
> wrote:
> >
> > > Paul Burba wrote:
> > >
> > >
> > > > If there are no objections I'll fix the mergeinfo on 1.5.x to reflect
> the
> > > >
> > > above.
> > > No objections here, and thanks for hunting this down.
> > >
> > > So, about Arfrever's mergeinfo tweaks (that started this whole
> discussion
> > > off): do those need to be reverted or otherwise changed, too?
> > >
> >
> > Yes, that is what I was suggesting (though not too clearly!). I want
> > to hand-edit the mergeinfo on 1.5.x and 1.5.x/CHANGES to reflect what
> > *should* of happened during Hyrum's merge of the 1.5.x-r30215 branch
> > to 1.5.x. (which set incorrect mergeinfo due to the aforementioned
> > bug) while also ignoreing Arfrever's fix of that mergeinfo. Sound ok?
> >
>
> +1
Fixed this in r30581, the log message should hopefully explain it all.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> On Wed, Apr 9, 2008 at 5:34 PM, C. Michael Pilato <cm...@collab.net> wrote:
>> Paul Burba wrote:
>>
>>> If there are no objections I'll fix the mergeinfo on 1.5.x to reflect the
>> above.
>> No objections here, and thanks for hunting this down.
>>
>> So, about Arfrever's mergeinfo tweaks (that started this whole discussion
>> off): do those need to be reverted or otherwise changed, too?
>
> Yes, that is what I was suggesting (though not too clearly!). I want
> to hand-edit the mergeinfo on 1.5.x and 1.5.x/CHANGES to reflect what
> *should* of happened during Hyrum's merge of the 1.5.x-r30215 branch
> to 1.5.x. (which set incorrect mergeinfo due to the aforementioned
> bug) while also ignoreing Arfrever's fix of that mergeinfo. Sound ok?
+1
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 9, 2008 at 5:34 PM, C. Michael Pilato <cm...@collab.net> wrote:
> Paul Burba wrote:
>
> > If there are no objections I'll fix the mergeinfo on 1.5.x to reflect the
> above.
> >
>
> No objections here, and thanks for hunting this down.
>
> So, about Arfrever's mergeinfo tweaks (that started this whole discussion
> off): do those need to be reverted or otherwise changed, too?
Yes, that is what I was suggesting (though not too clearly!). I want
to hand-edit the mergeinfo on 1.5.x and 1.5.x/CHANGES to reflect what
*should* of happened during Hyrum's merge of the 1.5.x-r30215 branch
to 1.5.x. (which set incorrect mergeinfo due to the aforementioned
bug) while also ignoreing Arfrever's fix of that mergeinfo. Sound ok?
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> If there are no objections I'll fix the mergeinfo on 1.5.x to reflect the above.
No objections here, and thanks for hunting this down.
So, about Arfrever's mergeinfo tweaks (that started this whole discussion
off): do those need to be reverted or otherwise changed, too?
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 9, 2008 at 5:32 PM, Paul Burba <pt...@gmail.com> wrote:
> I found the problem, it was a bug in
> merge.c:filter_self_referential_mergeinfo(). When manipulating and
> array of svn_prop_t, when the svn_prop_t for svn:mergeinfo was
> processed a *separate* svn_prop_t was created for each merge source.
> Ultimately this caused libsvn_wc/props.c:svn_wc__merge_props() to call
> props:apply_single_prop_change() *multiple* times for svn:mergeinfo
> leading to the odd results. Fixed that in r?????
^^^^
r30467, sorry
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 9, 2008 at 1:44 PM, Paul Burba <pt...@gmail.com> wrote:
>
> On Wed, Apr 9, 2008 at 12:42 PM, C. Michael Pilato <cm...@collab.net> wrote:
> >
> > > 'svn help merge' contains this:
> > >
> > > [...]
> > > 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
> > > [...]
> > > 3. In the third form, SOURCE can be either a URL or a working copy
> > > path (in which case its corresponding URL is used). SOURCE (in
> > > revision REV) is compared as it existed between revisions N and M
> > > for each revision range provided. If REV is not specified, HEAD
> > > is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
> > > does the reverse: '-r M:<M-1>'. If no revision ranges are
> > > specified, the default range of 0:HEAD is used. Multiple '-c'
> > > and/or '-r' instances may be specified, and mixing of forward
> > > and reverse ranges is allowed.
> > >
> > > Maybe I got bit by the default range of 0:HEAD? That's a stupid default,
> > by the way, and inconsistent with our policy of allowing specified peg
> > revisions dictate the upper bound on the operative revision range.
> > >
> >
> > I'm testing a patch for this now. (I suspect that I actually wrote the
> > bogus code myself, too.)
> >
> >
> > > But anyway, I tried with the obvious workaround:
> >
> > >
> > > $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 .
> > \
> > > -r0:30348
> > > subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
> > > svn: Working copy path 'CHANGES' does not exist in repository
> > > $
> > >
> >
> > Not sure what's up here.
> >
> >
> >
> > > (Sidebar: 'svn help log' indicates that HEAD:1 is the default revision
> > range even when a peg revision to the URL is supplied. Clearly, that's a
> > lie. How many bugs are we up to now?)
> > >
> >
> > This was fixed in r30449, and proposed for backport to 1.5.x.
> >
> >
> >
> >
> > > Anyway, back to using a real range for this merge:
> > >
> > > $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
> > -r30222:30348 .
> > > --- Merging r30223 through r30348 into '.':
> > > U subversion/include/svn_client.h
> > > U subversion/libsvn_client/util.c
> > > U subversion/libsvn_client/mergeinfo.c
> > > U subversion/tests/cmdline/mergeinfo_tests.py
> > > U subversion/tests/cmdline/svntest/actions.py
> > > D subversion/tests/cmdline/svntest/parsers.py
> > > U subversion/svn/cl.h
> > > U subversion/svn/mergeinfo-cmd.c
> > > U subversion/svn/util.c
> > > U subversion/svn/main.c
> > > G .
> > > $ svn st
> > > M .
> > > M subversion/include/svn_client.h
> > > M subversion/libsvn_client/util.c
> > > M subversion/libsvn_client/mergeinfo.c
> > > M subversion/tests/cmdline/mergeinfo_tests.py
> > > D subversion/tests/cmdline/svntest/parsers.py
> > > M subversion/tests/cmdline/svntest/actions.py
> > > M subversion/svn/cl.h
> > > M subversion/svn/mergeinfo-cmd.c
> > > M subversion/svn/util.c
> > > M subversion/svn/main.c
> > > M CHANGES
> > > $ svn diff --depth empty
> > >
> > > Property changes on: .
> > > ___________________________________________________________________
> > > Modified: svn:mergeinfo
> > > Reverse-merged
> > /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,2993!
9-29
> > >
> > 94
> >
> > >
> > >
> > 0,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
> > > Reverse-merged /branches/svn-mergeinfo-enhancements:r30122
> > > Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
> > > Merged /branches/1.5.x-r30215:r30223-30348
> > > Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
> > > $
> > >
> > > Oh boy. That's all so very not good. My guess? The svn:mergeinfo
> > property actually stored on the backport branch first blew away the one
> > stored on in the 1.5.x branch, and then was modified to include the current
> > merge operation.
> > >
> >
> > I haven't even begun to look into this. I should note, though, that my
> > Subversion client was probably of 1.5.x-rc1 pedigree, so not quite the
> > newest code.
>
> I'm looking into this now.
>
> Paul
I found the problem, it was a bug in
merge.c:filter_self_referential_mergeinfo(). When manipulating and
array of svn_prop_t, when the svn_prop_t for svn:mergeinfo was
processed a *separate* svn_prop_t was created for each merge source.
Ultimately this caused libsvn_wc/props.c:svn_wc__merge_props() to call
props:apply_single_prop_change() *multiple* times for svn:mergeinfo
leading to the odd results. Fixed that in r?????
Here is the behavior now:
>svn info 1.5.x
Path: 1.5.x
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: 30348
Node Kind: directory
Schedule: normal
Last Changed Author: hwright
Last Changed Rev: 30348
Last Changed Date: 2008-04-05 14:13:08 -0400 (Sat, 05 Apr 2008)
>svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
-r30222:30348 1.5.x
--- Merging r30223 through r30348 into '1.5.x':
U 1.5.x\subversion\include\svn_client.h
U 1.5.x\subversion\libsvn_client\util.c
U 1.5.x\subversion\libsvn_client\mergeinfo.c
U 1.5.x\subversion\tests\cmdline\mergeinfo_tests.py
U 1.5.x\subversion\tests\cmdline\svntest\actions.py
D 1.5.x\subversion\tests\cmdline\svntest\parsers.py
U 1.5.x\subversion\svn\cl.h
U 1.5.x\subversion\svn\mergeinfo-cmd.c
U 1.5.x\subversion\svn\util.c
U 1.5.x\subversion\svn\main.c
G 1.5.x
>svn st 1.5.x
M 1.5.x
M 1.5.x\subversion\include\svn_client.h
M 1.5.x\subversion\libsvn_client\util.c
M 1.5.x\subversion\libsvn_client\mergeinfo.c
M 1.5.x\subversion\tests\cmdline\mergeinfo_tests.py
D 1.5.x\subversion\tests\cmdline\svntest\parsers.py
M 1.5.x\subversion\tests\cmdline\svntest\actions.py
M 1.5.x\subversion\svn\cl.h
M 1.5.x\subversion\svn\mergeinfo-cmd.c
M 1.5.x\subversion\svn\util.c
M 1.5.x\subversion\svn\main.c
M 1.5.x\CHANGES
>svn diff --depth empty 1.5.x
Property changes on: 1.5.x
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
Merged /branches/1.5.x-r30215:r30223-30348
Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
That looks right, it represents the merge itself and the svn:mergeinfo
coming from the 1.5.x-r30215 branch:
>svn diff -N http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
-r30222:30348
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
Note also that CHANGES, which has its own explicit mergeinfo gets updated too:
>svn diff 1.5.x\CHANGES
Property changes on: 1.5.x\CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
Merged /branches/1.5.x-r30215/CHANGES:r30223-30348
If there are no objections I'll fix the mergeinfo on 1.5.x to reflect the above.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 9, 2008 at 12:42 PM, C. Michael Pilato <cm...@collab.net> wrote:
>
> > 'svn help merge' contains this:
> >
> > [...]
> > 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
> > [...]
> > 3. In the third form, SOURCE can be either a URL or a working copy
> > path (in which case its corresponding URL is used). SOURCE (in
> > revision REV) is compared as it existed between revisions N and M
> > for each revision range provided. If REV is not specified, HEAD
> > is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
> > does the reverse: '-r M:<M-1>'. If no revision ranges are
> > specified, the default range of 0:HEAD is used. Multiple '-c'
> > and/or '-r' instances may be specified, and mixing of forward
> > and reverse ranges is allowed.
> >
> > Maybe I got bit by the default range of 0:HEAD? That's a stupid default,
> by the way, and inconsistent with our policy of allowing specified peg
> revisions dictate the upper bound on the operative revision range.
> >
>
> I'm testing a patch for this now. (I suspect that I actually wrote the
> bogus code myself, too.)
>
>
> > But anyway, I tried with the obvious workaround:
>
> >
> > $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 .
> \
> > -r0:30348
> > subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
> > svn: Working copy path 'CHANGES' does not exist in repository
> > $
> >
>
> Not sure what's up here.
>
>
>
> > (Sidebar: 'svn help log' indicates that HEAD:1 is the default revision
> range even when a peg revision to the URL is supplied. Clearly, that's a
> lie. How many bugs are we up to now?)
> >
>
> This was fixed in r30449, and proposed for backport to 1.5.x.
>
>
>
>
> > Anyway, back to using a real range for this merge:
> >
> > $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
> -r30222:30348 .
> > --- Merging r30223 through r30348 into '.':
> > U subversion/include/svn_client.h
> > U subversion/libsvn_client/util.c
> > U subversion/libsvn_client/mergeinfo.c
> > U subversion/tests/cmdline/mergeinfo_tests.py
> > U subversion/tests/cmdline/svntest/actions.py
> > D subversion/tests/cmdline/svntest/parsers.py
> > U subversion/svn/cl.h
> > U subversion/svn/mergeinfo-cmd.c
> > U subversion/svn/util.c
> > U subversion/svn/main.c
> > G .
> > $ svn st
> > M .
> > M subversion/include/svn_client.h
> > M subversion/libsvn_client/util.c
> > M subversion/libsvn_client/mergeinfo.c
> > M subversion/tests/cmdline/mergeinfo_tests.py
> > D subversion/tests/cmdline/svntest/parsers.py
> > M subversion/tests/cmdline/svntest/actions.py
> > M subversion/svn/cl.h
> > M subversion/svn/mergeinfo-cmd.c
> > M subversion/svn/util.c
> > M subversion/svn/main.c
> > M CHANGES
> > $ svn diff --depth empty
> >
> > Property changes on: .
> > ___________________________________________________________________
> > Modified: svn:mergeinfo
> > Reverse-merged
> /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-29
> >
> 94
>
> >
> >
> 0,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
> > Reverse-merged /branches/svn-mergeinfo-enhancements:r30122
> > Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
> > Merged /branches/1.5.x-r30215:r30223-30348
> > Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
> > $
> >
> > Oh boy. That's all so very not good. My guess? The svn:mergeinfo
> property actually stored on the backport branch first blew away the one
> stored on in the 1.5.x branch, and then was modified to include the current
> merge operation.
> >
>
> I haven't even begun to look into this. I should note, though, that my
> Subversion client was probably of 1.5.x-rc1 pedigree, so not quite the
> newest code.
I'm looking into this now.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "C. Michael Pilato" <cm...@collab.net>.
> 'svn help merge' contains this:
>
> [...]
> 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
> [...]
> 3. In the third form, SOURCE can be either a URL or a working copy
> path (in which case its corresponding URL is used). SOURCE (in
> revision REV) is compared as it existed between revisions N and M
> for each revision range provided. If REV is not specified, HEAD
> is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
> does the reverse: '-r M:<M-1>'. If no revision ranges are
> specified, the default range of 0:HEAD is used. Multiple '-c'
> and/or '-r' instances may be specified, and mixing of forward
> and reverse ranges is allowed.
>
> Maybe I got bit by the default range of 0:HEAD? That's a stupid
> default, by the way, and inconsistent with our policy of allowing
> specified peg revisions dictate the upper bound on the operative
> revision range.
I'm testing a patch for this now. (I suspect that I actually wrote the
bogus code myself, too.)
> But anyway, I tried with the obvious workaround:
>
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 . \
> -r0:30348
> subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
> svn: Working copy path 'CHANGES' does not exist in repository
> $
Not sure what's up here.
> (Sidebar: 'svn help log' indicates that HEAD:1 is the default revision
> range even when a peg revision to the URL is supplied. Clearly, that's
> a lie. How many bugs are we up to now?)
This was fixed in r30449, and proposed for backport to 1.5.x.
> Anyway, back to using a real range for this merge:
>
> $ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
> -r30222:30348 .
> --- Merging r30223 through r30348 into '.':
> U subversion/include/svn_client.h
> U subversion/libsvn_client/util.c
> U subversion/libsvn_client/mergeinfo.c
> U subversion/tests/cmdline/mergeinfo_tests.py
> U subversion/tests/cmdline/svntest/actions.py
> D subversion/tests/cmdline/svntest/parsers.py
> U subversion/svn/cl.h
> U subversion/svn/mergeinfo-cmd.c
> U subversion/svn/util.c
> U subversion/svn/main.c
> G .
> $ svn st
> M .
> M subversion/include/svn_client.h
> M subversion/libsvn_client/util.c
> M subversion/libsvn_client/mergeinfo.c
> M subversion/tests/cmdline/mergeinfo_tests.py
> D subversion/tests/cmdline/svntest/parsers.py
> M subversion/tests/cmdline/svntest/actions.py
> M subversion/svn/cl.h
> M subversion/svn/mergeinfo-cmd.c
> M subversion/svn/util.c
> M subversion/svn/main.c
> M CHANGES
> $ svn diff --depth empty
>
> Property changes on: .
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Reverse-merged
> /trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-29
94
>
> 0,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
>
> Reverse-merged /branches/svn-mergeinfo-enhancements:r30122
> Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
> Merged /branches/1.5.x-r30215:r30223-30348
> Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
> $
>
> Oh boy. That's all so very not good. My guess? The svn:mergeinfo
> property actually stored on the backport branch first blew away the one
> stored on in the 1.5.x branch, and then was modified to include the
> current merge operation.
I haven't even begun to look into this. I should note, though, that my
Subversion client was probably of 1.5.x-rc1 pedigree, so not quite the
newest code.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "C. Michael Pilato" <cm...@collab.net>.
Hyrum K. Wright wrote:
>> Hyrum - any thoughts as to what happened? I recall in IRC you were
>> had some questions about how exactly to merge the 1.5.x-r30215 branch
>> to 1.5.x. What did you ultimately end up doing?
>
> After a couple of failed attempts, the command I ultimately ended up
> running was:
> $ svn merge -c 30236,30238,30245,30288
> https://svn.collab.net/repos/svn/branches/1.5.x-r30215
I cut the 1.5.x-r30215 branch from the 1.5.x branch. You should have needed
only to do:
svn merge https://svn.collab.net/repos/svn/branches/1.5.x-r30215 \
/path/to/subversion-1.5.x
I tried to replay this scenario (which ought to be time-safe, right?), but I
got an error:
$ cd projects/subversion-1.5.x
$ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 .
subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
svn: File not found: revision 30447, path '/branches/1.5.x-r30215'
$
'svn help merge' contains this:
[...]
3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
[...]
3. In the third form, SOURCE can be either a URL or a working copy
path (in which case its corresponding URL is used). SOURCE (in
revision REV) is compared as it existed between revisions N and M
for each revision range provided. If REV is not specified, HEAD
is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
does the reverse: '-r M:<M-1>'. If no revision ranges are
specified, the default range of 0:HEAD is used. Multiple '-c'
and/or '-r' instances may be specified, and mixing of forward
and reverse ranges is allowed.
Maybe I got bit by the default range of 0:HEAD? That's a stupid default, by
the way, and inconsistent with our policy of allowing specified peg
revisions dictate the upper bound on the operative revision range. But
anyway, I tried with the obvious workaround:
$ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 . \
-r0:30348
subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
svn: Working copy path 'CHANGES' does not exist in repository
$
Ooookay. Well, I'll use 'svn log' to find a real range, then.
$ svn log -q --stop-on-copy \
http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348 \
| grep '^r' | tail -1
r30222 | cmpilato | 2008-04-03 13:38:30 -0400 (Thu, 03 Apr 2008)
$
(Sidebar: 'svn help log' indicates that HEAD:1 is the default revision
range even when a peg revision to the URL is supplied. Clearly, that's a
lie. How many bugs are we up to now?)
Anyway, back to using a real range for this merge:
$ svn merge http://svn.collab.net/repos/svn/branches/1.5.x-r30215@30348
-r30222:30348 .
--- Merging r30223 through r30348 into '.':
U subversion/include/svn_client.h
U subversion/libsvn_client/util.c
U subversion/libsvn_client/mergeinfo.c
U subversion/tests/cmdline/mergeinfo_tests.py
U subversion/tests/cmdline/svntest/actions.py
D subversion/tests/cmdline/svntest/parsers.py
U subversion/svn/cl.h
U subversion/svn/mergeinfo-cmd.c
U subversion/svn/util.c
U subversion/svn/main.c
G .
$ svn st
M .
M subversion/include/svn_client.h
M subversion/libsvn_client/util.c
M subversion/libsvn_client/mergeinfo.c
M subversion/tests/cmdline/mergeinfo_tests.py
D subversion/tests/cmdline/svntest/parsers.py
M subversion/tests/cmdline/svntest/actions.py
M subversion/svn/cl.h
M subversion/svn/mergeinfo-cmd.c
M subversion/svn/util.c
M subversion/svn/main.c
M CHANGES
$ svn diff --depth empty
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged
/trunk:r29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,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-29325,29327-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,29634,29642,29648,29650,29656,29659-29660,29663-29664,29671-29672,29677-29680,29692,29738-29739,29742-29744,29746,29751,29763,29769-29770,29784,29787,29797,29801,29821,29824,29828,29835,29855,29858-29859,29868-29869,29876,29878,29883-29884,29895,29898,29900,29914,29920,29925,29930,29939-2994
0,29942,29950,29958,29962,29968,29980,29986,29994-29997,30004,30009,30020,30030,30050,30054,30061-30062,30067,30070,30074,30086,30098,30117,30124,30130,30137,30145,30151,30159,30162,30185
Reverse-merged /branches/svn-mergeinfo-enhancements:r30122
Merged /trunk:r30215,30221,30225-30226,30230,30243,30286
Merged /branches/1.5.x-r30215:r30223-30348
Merged /branches/svn-mergeinfo-enhancements:r30045-30121,30123-30214
$
Oh boy. That's all so very not good. My guess? The svn:mergeinfo property
actually stored on the backport branch first blew away the one stored on in
the 1.5.x branch, and then was modified to include the current merge operation.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Paul Burba wrote:
> On Wed, Apr 9, 2008 at 8:50 AM, Arfrever Frehtes Taifersar Arahesis
> <ar...@gmail.com> wrote:
>> 2008-04-08 16:16 Paul Burba <pt...@gmail.com> napisał(a):
>>
>>> On Mon, Apr 7, 2008 at 5:32 AM, <ar...@tigris.org> wrote:
>> > > Author: arfrever
>> > > Date: Mon Apr 7 02:32:05 2008
>> > > New Revision: 30390
>> > >
>> > > Log:
>> > > Fix svn:mergeinfo on the 1.5.x branch.
>> > >
>> > > Modified:
>> > > branches/1.5.x/ (props changed)
>> >
>> > Hi Arfrever,
>> >
>> > Why was this change made?
>>
>> Since r30349 svn:mergeinfo didn't contain many already merged revisions.
>
> Yes, I see that, but why did you get rid of the mergeinfo for
> '/branches/1.5.x-r30215:30236,30238,30245,30288'? Also, how did you
> "fix" the mergeinfo? Did you hand edit the property or use merge
> --record-only, or something else?
>
> And of course this all begs the question, why did r30349 change the
> mergeinfo on 1.5.x the way it did:
>
>> svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30348
> /branches/svn-mergeinfo-enhancements:30122
> /trunk:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29168,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,29854-29855,29858-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,2999
> 4-29997,30004,30009,30020,30030,30050,30054,30059,30061-30062,30067,30070,30074,30086,30098,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,301
> 80-30181,30185,30210,30233,30237,30239,30246,30249,30256,30321
>
>> svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30349
> /branches/1.5.x-r30215:30236,30238,30245,30288
> /trunk:29168,29326,29633,29645,29665-29666,29741,29767,29786,29815,29854,29922,29965,29967,30059,30129,30161,30180-30181,30210,30233,30237,30239,30246,3024
> 9,30256,30286,30321
>
> Hyrum - any thoughts as to what happened? I recall in IRC you were
> had some questions about how exactly to merge the 1.5.x-r30215 branch
> to 1.5.x. What did you ultimately end up doing?
After a couple of failed attempts, the command I ultimately ended up
running was:
$ svn merge -c 30236,30238,30245,30288
https://svn.collab.net/repos/svn/branches/1.5.x-r30215
> P.S. Arfrever - I don't think we should go around "fixing" mergeinfo
> on our repository without a bit more discussion first! I'd rather fix
> Subversion than fix the mergeinfo and hide the fact that we may have a
> bug.
+1
-Hyrum
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by "C. Michael Pilato" <cm...@collab.net>.
Paul Burba wrote:
> P.S. Arfrever - I don't think we should go around "fixing" mergeinfo
> on our repository without a bit more discussion first! I'd rather fix
> Subversion than fix the mergeinfo and hide the fact that we may have a
> bug.
Hearty, hearty, +1. Since there are so precious few of us who actually know
the merge tracking logic well enough to determine what constitutes "broken
mergeinfo", such open discussions will only serve to better educate the rest
of the community.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-04-09 15:22 Paul Burba <pt...@gmail.com> napisał(a):
> On Wed, Apr 9, 2008 at 8:50 AM, Arfrever Frehtes Taifersar Arahesis
> <ar...@gmail.com> wrote:
> > 2008-04-08 16:16 Paul Burba <pt...@gmail.com> napisał(a):
> >
> > > On Mon, Apr 7, 2008 at 5:32 AM, <ar...@tigris.org> wrote:
> > > > Author: arfrever
> > > > Date: Mon Apr 7 02:32:05 2008
> > > > New Revision: 30390
> > > >
> > > > Log:
> > > > Fix svn:mergeinfo on the 1.5.x branch.
> > > >
> > > > Modified:
> > > > branches/1.5.x/ (props changed)
> > >
> > > Hi Arfrever,
> > >
> > > Why was this change made?
> >
> > Since r30349 svn:mergeinfo didn't contain many already merged revisions.
>
> Yes, I see that, but why did you get rid of the mergeinfo for
> '/branches/1.5.x-r30215:30236,30238,30245,30288'?
"1.5.x-r30215" was a temporary, short-living branch so I thought that
the mergeinfo for '/branches/1.5.x-r30215:30236,30238,30245,30288'
rather wasn't useful.
You can add it, if it is needed.
> Also, how did you "fix" the mergeinfo? Did you hand edit the property or use
> merge --record-only, or something else?
I hand edited it.
> And of course this all begs the question, why did r30349 change the
> mergeinfo on 1.5.x the way it did:
>
> >svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30348
> /branches/svn-mergeinfo-enhancements:30122
> /trunk:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29168,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,29854-29855,29858-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,2999
> 4-29997,30004,30009,30020,30030,30050,30054,30059,30061-30062,30067,30070,30074,30086,30098,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,301
> 80-30181,30185,30210,30233,30237,30239,30246,30249,30256,30321
>
> >svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30349
> /branches/1.5.x-r30215:30236,30238,30245,30288
> /trunk:29168,29326,29633,29645,29665-29666,29741,29767,29786,29815,29854,29922,29965,29967,30059,30129,30161,30180-30181,30210,30233,30237,30239,30246,3024
> 9,30256,30286,30321
>
> Hyrum - any thoughts as to what happened? I recall in IRC you were
> had some questions about how exactly to merge the 1.5.x-r30215 branch
> to 1.5.x. What did you ultimately end up doing?
>
> Paul
>
> P.S. Arfrever - I don't think we should go around "fixing" mergeinfo
> on our repository without a bit more discussion first! I'd rather fix
> Subversion than fix the mergeinfo and hide the fact that we may have a
> bug.
OK.
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Apr 9, 2008 at 8:50 AM, Arfrever Frehtes Taifersar Arahesis
<ar...@gmail.com> wrote:
> 2008-04-08 16:16 Paul Burba <pt...@gmail.com> napisał(a):
>
> > On Mon, Apr 7, 2008 at 5:32 AM, <ar...@tigris.org> wrote:
> > > Author: arfrever
> > > Date: Mon Apr 7 02:32:05 2008
> > > New Revision: 30390
> > >
> > > Log:
> > > Fix svn:mergeinfo on the 1.5.x branch.
> > >
> > > Modified:
> > > branches/1.5.x/ (props changed)
> >
> > Hi Arfrever,
> >
> > Why was this change made?
>
> Since r30349 svn:mergeinfo didn't contain many already merged revisions.
Yes, I see that, but why did you get rid of the mergeinfo for
'/branches/1.5.x-r30215:30236,30238,30245,30288'? Also, how did you
"fix" the mergeinfo? Did you hand edit the property or use merge
--record-only, or something else?
And of course this all begs the question, why did r30349 change the
mergeinfo on 1.5.x the way it did:
>svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30348
/branches/svn-mergeinfo-enhancements:30122
/trunk:29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29168,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,29854-29855,29858-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,2999
4-29997,30004,30009,30020,30030,30050,30054,30059,30061-30062,30067,30070,30074,30086,30098,30117,30124,30129-30130,30137,30145,30151,30159,30161-30162,301
80-30181,30185,30210,30233,30237,30239,30246,30249,30256,30321
>svn pg svn:mergeinfo http://svn.collab.net/repos/svn/branches/1.5.x@30349
/branches/1.5.x-r30215:30236,30238,30245,30288
/trunk:29168,29326,29633,29645,29665-29666,29741,29767,29786,29815,29854,29922,29965,29967,30059,30129,30161,30180-30181,30210,30233,30237,30239,30246,3024
9,30256,30286,30321
Hyrum - any thoughts as to what happened? I recall in IRC you were
had some questions about how exactly to merge the 1.5.x-r30215 branch
to 1.5.x. What did you ultimately end up doing?
Paul
P.S. Arfrever - I don't think we should go around "fixing" mergeinfo
on our repository without a bit more discussion first! I'd rather fix
Subversion than fix the mergeinfo and hide the fact that we may have a
bug.
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>.
2008-04-08 16:16 Paul Burba <pt...@gmail.com> napisał(a):
> On Mon, Apr 7, 2008 at 5:32 AM, <ar...@tigris.org> wrote:
> > Author: arfrever
> > Date: Mon Apr 7 02:32:05 2008
> > New Revision: 30390
> >
> > Log:
> > Fix svn:mergeinfo on the 1.5.x branch.
> >
> > Modified:
> > branches/1.5.x/ (props changed)
>
> Hi Arfrever,
>
> Why was this change made?
Since r30349 svn:mergeinfo didn't contain many already merged revisions.
Re: Tweaking 1.5.x's Mergeinfo (Was: svn commit: r30390 - branches/1.5.x)
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Apr 8, 2008 at 10:16 AM, Paul Burba <pt...@gmail.com> wrote:
> Why was this change made? The log message is rather vague...
>
> Was there any discussion in IRC or on dev about it (my apologies if I
> missed it)?
I am glad you brought this up. I was wondering why the mergeinfo for
the branch did contain any mention of the 1.5.x-r30215 branch which I
knew Hyrum merged from.
I also thought there might be a bug in the mergeinfo API since it
showed those trunk revisions as eligible to merge to the 1.5.x branch.
I will be interested to hear an explanation for this as well.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org