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

Re: CONFLICTS in cvs2svn.py output

From: Michael Wood <mwood_at_its.uct.ac.za>
Date: 2002-12-13 09:31:55 CET

On Thu, Dec 12, 2002 at 01:00:42AM -0600, Scott Lamb wrote:
> Tim Moloney wrote:
> >No matter what CVS repository I try to convert, I see
> >
> > CONFLICTS: '_fc601008_p_char'
> >
> >for every commit.
> >
> >Should I be worried about this? Is it a cosmetic bug? I've had
> >a lot of problems getting swig working that I don't want to assume
> >anything.
> FWIW, I also get this message on the latest cvs2svn-mmacek, and I had

I believe this is caused by a problem with the SWIG bindings.

That _fc601008_p_char should be converted to a python string, but it's
not being done. A while ago I created a tiny SWIG binding for a
function that just converts a C string to a Python string, then called
that from within cvs2svn and found that conflicts just contained "\n".

So the conflicts you see are probably not actual conflicts, but this
should still be fixed.

Michael Wood <mwood@its.uct.ac.za>
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 13 09:32:48 2002

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