Simon McClenahan wrote:
>I just tried to do a commit with a message, and got the same error! Am I not using the Win32 command line correctly?
>
>C:\projects\branches\billing>svn commit -m "Merged trunk changes r272:346 into branches/billing"
>svn: Error resolving case of 'r272:346'
>
>
This is all very strange. Does this happen in any working copy, or just
one? Are you sure you're not using some sort of wrapper around the
Subversion binaries?
>-----Original Message-----
>From: Simon McClenahan
>Sent: Monday, June 14, 2004 5:58 PM
>To: Subversion Users (E-mail)
>Subject: Error resolving case?
>
>
>usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
> 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
> 3. merge -r N:M SOURCE [WCPATH]
>
>I was trying to use the third form without success. I finally got my merge to work with the first form. I'm using the Win32 client.
>
>C:\projects\branches\billing>svn --version
>svn, version 1.0.5 (r9954)
> compiled Jun 11 2004, 09:44:29
>
>C:\projects\branches\billing>svn update
>At revision 346.
>
>C:\projects\branches\billing>svn merge -r 272:HEAD http://bart/svn/online/trunk
>svn: Error resolving case of '272:HEAD'
>
>C:\projects\branches\billing>svn merge -r 272:346 http://bart/svn/online/trunk
>svn: Error resolving case of '272:346'
>
>C:\projects\branches\billing>svn merge -r 272:HEAD http://bart/svn/online/trunk .
>svn: Error resolving case of '272:HEAD'
>
>C:\projects\branches\billing>svn merge --revision 272:346 http://bart/svn/online/trunk
>svn: Error resolving case of '272:346'
>
>
>
>This worked:
>
>
>C:\projects\branches\billing>svn merge http://bart/svn/online/trunk@272 http://bart/svn/online/trunk
>
>
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 16 18:01:40 2004