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

Error resolving case?

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-06-15 00:57:39 CEST

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

--------------------------
NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 15 00:59:04 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.