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

RE: Re: Re: svn does not seem able to merge

From: Merlin Moncure <merlin.moncure_at_rcsonline.com>
Date: 2004-08-17 22:37:47 CEST

> >
> > I used the perl one. The options were stock except for warning
> > suppression and file inclusion...did I err? :)
> No error, I didn't know there was a perl one... I'm just wrestling
with a
> similar problem when using cvs2svn and trying to understand how it's
> handling the eol properties.

The converter is called refinecvs. I used it because it had a lot less
dependences than the python one and I never could get the python one
working (turned out to be an undocumented dependency on 2.2).

I'm not sure if the converter switched all my eols or the repository is
doing it. If it was the converter (and this is causing my conflict
problem), I imagine the problem would eventually work itself out. If
it's the repository, I have a serious problem.

I'll do some research this one.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 22:39: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.