RE: Error resolving case?
From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-06-15 16:43:23 CEST
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"
-----Original Message-----
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [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
C:\projects\branches\billing>svn update
C:\projects\branches\billing>svn merge -r 272:HEAD http://bart/svn/online/trunk
C:\projects\branches\billing>svn merge -r 272:346 http://bart/svn/online/trunk
C:\projects\branches\billing>svn merge -r 272:HEAD http://bart/svn/online/trunk .
C:\projects\branches\billing>svn merge --revision 272:346 http://bart/svn/online/trunk
This worked:
C:\projects\branches\billing>svn merge http://bart/svn/online/trunk@272 http://bart/svn/online/trunk
--------------------------
---------------------------------------------------------------------
---------------------------------------------------------------------
|
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.