[Svnmerge] Using svnmerge.py from the cygwin command line

[Irvine, Chuck R [EQ]]

If you use the cygwin version of svn that might be where the difference
is. I have had bad results using cygwin svn on subclipse and TortiseSVN
workspaces because of line ending issues. I using the binary
installation option for cygwin, mainly because that's what they seem to
recommend. If you have the end-of-line property set to native, Subclipse
will add dos line endings whereas cygwin svn will add unix line endings.
This I've found can lead to files having mixed line ending and this can
be a mess to clean up.

> -----Original Message-----
> From: svnmerge-bounces+chuck.r.irvine=embarq.com at orcaware.com 
> [mailto:svnmerge-bounces+chuck.r.irvine=embarq.com at orcaware.co
> m] On Behalf Of Mark Kempster
> Sent: Thursday, April 26, 2007 9:56 PM
> To: Irvine, Chuck R [EQ]
> Cc: svnmerge at orcaware.com
> Subject: Re: [Svnmerge] Using svnmerge.py from the cygwin command line
> 
> 
> Chuck -
> I use the setup you describe below daily - cygwin, svn, 
> svnmerge, eclipse, tortoisesvn (occasionally) and subclipse. 
> I haven't noticed any errors with line endings and the like, 
> but in general I make sure that any cygwin editors keep to 
> the ms-dos line endings to avoid problems with other developers.
> 
> The one thing I noticed in your paste is 
> "C:\Python25\python.exe" - I think the python I'm using is 
> from the cygwin package, so (guessing here) the cygwin-based 
> python just does the Right Thing wrt. unix-flavored paths.
> 
> Cheers
> - Mark
> 
> On Wed, 25 Apr 2007 13:27:13 -0500, "Irvine, Chuck R [EQ]" 
> <Chuck.R.Irvine at embarq.com> wrote:
> > I would like to be able to use svn and svnmerge from the 
> cygwiw/bash 
> > command because of the limited functionality of the windows command 
> > prompt windows.
> > 
> > I also want to be able to use TortiseSVN, Subclipse, and 
> command-line 
> > svn interchangable on the same svn workspaces. Because of 
> line-ending 
> > issues, I can't use the cygwin version of svn with Subclipse and 
> > Tortise, i.e. you can get into various kinds of line ending 
> > corruption.
> > 
> > Usually, it is possible in general to run windows commmand-line 
> > commands under cygwin. However, when I try to do this with 
> svnmerge, I 
> > get errors. For example:
> > 
> > R2-trunk$ svnmerge.py init 
> > http://tvmk7235.test.intranet:1025/svn/rTestA/Chuck/App1/branches/R1
> > c:\Python25\python.exe: can't open file
> > '/cygdrive/c/apps/subversion-1.4.3/contrib/client-side/svnmerge.py':
> > [Errno 2] No such file or directory
> > 
> > So, somewhere a cygwin style path name is being picked up.
> > 
> > Does anyone happen to know of a way to do what I'm trying to do?
> > 
> > Thanks,
> > Chuck
> > 
> > 
> > _______________________________________________
> > Svnmerge mailing list
> > Svnmerge at orcaware.com 
> > http://www.orcaware.com/mailman/listinfo/svnmerge
> 
> _______________________________________________
> Svnmerge mailing list
> Svnmerge at orcaware.com 
> http://www.orcaware.com/mailman/listinfo/svnmerge
> 
>