[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging and gratuitous display of explicit mergeinfo.

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 7 Mar 2008 10:36:06 -0500

On Fri, Mar 7, 2008 at 10:04 AM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> wrote:
>

<snip>

> Hmm, I could have sworn that I did a re-checkout of all my working
> copies post-cmpilato's upgrade. I thought the mergeinfo conversion
> happened at the same time as the upgrade,

There was definitely a window:

Feb 29 11:38:56 *cmpilato has changed the topic to: Subversion
development | svn.collab.net is down for upgrade to 1.5.0-alpha2
.
.
The question of 'What to do about our repository' is resolved
http://svn.haxx.se/dev/archive-2008-03/0107.shtml
.
.
Mar 05 11:29:03 *cmpilato has changed the topic to: Subversion
development discussion | CHECKOUT NEW WORKING COPIES OF SVN.COLLAB.NET
REPOSITORIES

> but if it didn't, I can see
> how a window would have opened up to allow this to happen.
>
> In any case, I'm sorry if I screwed stuff up. :(

That doesn't even qualify as a screw up! If that's as bad as it gets
we are doing ok.

> > C:\SVN>svn co http://svn.collab.net/repos/svn/branches/1.5.x@29758 1.5.x -q
> >
> > C:\SVN>svn pg svn:mergeinfo -R 1.5.x
> > 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> > 29194,29198-29200,29202-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-29438,29440-29447,29449-29466,29468-2947
> > 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> > 94,29614,29619,29623,29625-29626,29634,29671-29672
> >
> > C:\SVN>svn merge http://svn.collab.net/repos/svn/trunk 1.5.x -c29678
> > --- Merging r29678 into '1.5.x':
> > U 1.5.x\subversion\tests\cmdline\getopt_tests.py
> >
> > C:\SVN>svn st 1.5.x
> > M 1.5.x
> > M 1.5.x\subversion\tests\cmdline\getopt_tests.py
> >
> > C:\SVN>svn pg svn:mergeinfo 1.5.x -R
> > 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> > 29194,29198-29200,29202-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-29438,29440-29447,29449-29466,29468-2947
> > 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> > 94,29614,29619,29623,29625-29626,29634,29671-29672,29678
> >
> > Seems if we just remove the mergeinfo on the six files in 1.5.x and
> > commit that, this problem will go away no?
>
> That *sounds* right, but my knowledge of the inner workings of mergeinfo
> is a bit shaky.

If no one objects I'll do this shortly.

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-03-07 16:36:20 CET

This is an archived mail posted to the Subversion Dev mailing list.