Re: Merge/Commit Bug?

Andy Somerville <andy.somerville.work@gmail.com> writes:
> 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.

Agree, with you that this is a bug; if you could file an issue that
would be great. A patch would be even better, but no obligation of
course.

Thanks for taking the time to post the transcript!

-Karl

-- 
www.collab.net  <>  CollabNet  |  Distributed Development On Demand
> 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/testTrunkLDI
> > > 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
> > >
> >
> > --
> > No virus found in this outgoing message.
> > Checked by AVG Free Edition.
> > Version: 7.1.371 / Virus Database: 267.14.15/223 - Release Date: 6/01/2006
> >
> >
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
> 
-- 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org