Hi dev-list,
I believe there is a bug in the URL checking code as per the attached
discussion from the users list.
I intend to file a bug report unless there is objection.
I can produce the patch myself, but I do not know when I will be able
to get to it.
Regards,
Andrew Somerville
---------- Forwarded message ----------
From: Lieven Govaerts <lgo@mobsol.be>
Date: Jan 9, 2006 2:54 PM
Subject: RE: Merge/Commit Bug?
To: Andy Somerville <andy.somerville.work@gmail.com>
Cc: users@subversion.tigris.org
Andy,
first send a mail to the dev@subversion.tigris.org list with
your findings. Devs can tell you how they feel about it.
I think svn should follow the specs, so in my opinion this is
a bug.
I checked the issue tracker and there is nothing filed yet
concerning hostname case btw.
Lieven.
!! :)
> -----Original Message-----
> From: Andy Somerville [mailto:andy.somerville.work@gmail.com]
> Sent: maandag 9 januari 2006 20:39
> To: Lieven Govaerts
> Cc: users@subversion.tigris.org
> Subject: Re: Merge/Commit Bug?
>
> Leiven,
>
> sed -i "s/iradCM/iradcm/g" "$line" worked like a charm.
> Thanks for the diagnosis.
>
> I think, however, that this should be considered a bug as
> hostnames in URIs should not be case sensitive.
> (http://www.ietf.org/rfc/rfc3986.txt : 6.2.2.1)
>
> Should I go ahead and file the report ?
>
> I can create the patch myself, but Im not sure when I will be
> able to get to it.
>
> Thanks,
> Andy
>
>
> On 1/9/06, Lieven Govaerts <lgo@mobsol.be> wrote:
> > Hi Andy,
> >
> > I see that your branch LDIModule_1.0.0.0 is identified by this path:
> > svn+ssh://andy.somerville@iradcm/svn/TouchTable/branches/...
> >
> > and the testTrunkLDI branch by this path:
> > svn+ssh://andy.somerville@iradCM/svn/TouchTable/branches/...
> >
> > You should use the same case for your hostname in both
> places ( iradCM
> > <-> iradcm ) since SVN does a string-compare on the repository
> > locations.
> >
> > hope this helps,
> >
> > Lieven.
> >
> >
> > > -----Original Message-----
> > > From: Andy Somerville [mailto:andy.somerville.work@gmail.com]
> > > Sent: maandag 9 januari 2006 18:38
> > > To: Lieven Govaerts
> > > Cc: users@subversion.tigris.org
> > > Subject: Re: Merge/Commit Bug?
> > >
> > > Leiven,
> > >
> > > I hope this is what you were requesting: (paths modified for
> > > terseness)
> > >
> > > - Originally I have repository repo.
> > >
> > > - at r84:
> > > svn cp svn+ssh://host/repo/trunk/myModule
> > > svn+ssh://host/repo/branches/myModuleBranch
> > >
> > > - changes to both the trunk and branch from r84 to r132
> > >
> > > - at r132
> > > svn cp svn+ssh://host/repo/branches/myModuleBranch
> > > svn+ssh://host/repo/branches/surrogateTrunk
> > >
> > >
> > > The from a checked out version of surrogateTrunk:
> > >
> > > - merge command
> > > svn merge -r84:132
> > > svn+ssh://host/repo/branches/myModuleBranch ./
> > >
> > > - It performs a merge and lists conflicts.
> > > - I fix the conflicts an attempt to commit
> > > svn commit -m 'please work : ('
> > >
> > > - error reponse (abriviated):
> > >
> > > Deleting....
> > > Adding...
> > > Sending...
> > > blabla...
> > > Transmitting file data ..svn: Commit failed (details follow):
> > > svn: Source url
> > > 'svn+ssh://host/repo/branches/myModuleBranch/LDIModule.sln'
> > > is from different repository
> > >
> > >
> > >
> > >
> > > Attached verbatum text: (myModule = LDIModule, myModuleBranch =
> > > LDIModule_1.0.0.0, surrogateTrunk = testTrunkLDI )
> > >
> > > $ svn commit -m "commit merge"
> > > Deleting HOW TO BUILD AND INSTALL.txt
> > > Adding LDIModule.sln
> > ...
> > > Adding src/prep/prep.csproj
> > > Transmitting file data ..svn: Commit failed (details follow):
> > > svn: Source url
> > > 'svn+ssh://andy.somerville@iradCM/svn/TouchTable/branches/LDIM
> > > odule_1.0.0.0/LDIModule.sln'
> > > is from different repository
> > >
> > >
> > >
> > >
> > > $ svn info
> > > Path: .
> > > URL:
> > >
> svn+ssh://andy.somerville@iradcm/svn/TouchTable/branches/testTrunkLD
> > > svn+I
> > > Repository UUID: 0b732039-bb06-0410-b9a1-f5b42b02fa3d
> > > Revision: 150
> > > Node Kind: directory
> > > Schedule: normal
> > > Last Changed Author: andy.somerville Last Changed Rev: 150 Last
> > > Changed Date: 2006-01-06 15:32:01 -0500 (Fri, 06 Jan 2006)
> > >
> > >
> > >
> > >
> > > $ svn status
> > > M src/LDIVisLib/LDIVisLib.csproj
> > > M src/LDIUtilityLib/APIProxy.cs
> > ...
> > > D bin/gemfire.properties
> > > D bin/msvcp71.DLL
> > > D bin/mde_telemetry.jar
> > > D HOW TO BUILD AND INSTALL.txt
> > > A + LDIModule.sln
> > >
> > >
> > > Andy
> > >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 11 17:15:41 2006