Daniel Berlin - Re: SVN conversion glitch? (original) (raw)

This is the mail archive of the gcc@gcc.gnu.orgmailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

On Wed, 2005-11-30 at 16:49 +0100, Gunther Nikl wrote:

On Wed, Nov 23, 2005 at 03:32:57PM +0100, Jakub Jelinek wrote:

While doing svn diff, I've noticed gcc/config/i386/xm-dgux.h gcc/config/i386/xm-sysv3.h gcc/config/i386/xm-sun.h gcc/config/i386/scodbx.h files popped out of nowhere on the trunk (and through 4.1 branching also on gcc-4_1-branch).

There seem to be more conversion glichtes.

I'm sure there are. It's a large repository, with 16 years of history, that has revisions generated by buggy CVS's, in addition to having a changeset grouping heuristic applied to it.

I retrieved gcc-2_95-branch from the svn repository and diffed it with my CVS checkout. The diff contained lots of differences. Many files had different CVS $Id strings. I was told that this is harmless but what is the reason for this difference?

Because i didn't convert with cvs keyword substution on.

However, there were a few files with different contents:

diff -x .svn -x CVS -rup ../GCC2/config/mpw/ChangeLog GCC2/config/mpw/ChangeLog diff -x .svn -x CVS -rup ../GCC2/libio/fstream.h GCC2/libio/fstream.h diff -x .svn -x CVS -rup ../GCC2/libio/isgetsb.cc GCC2/libio/isgetsb.cc diff -x .svn -x CVS -rup ../GCC2/libio/isscan.cc GCC2/libio/isscan.cc diff -x .svn -x CVS -rup ../GCC2/libio/parsestream.h GCC2/libio/parsestream.h diff -x .svn -x CVS -rup ../GCC2/libio/stdstreams.cc GCC2/libio/stdstreams.cc diff -x .svn -x CVS -rup ../GCC2/libio/stream.h GCC2/libio/stream.h diff -x .svn -x CVS -rup ../GCC2/libio/strstream.h GCC2/libio/strstream.h

Does that indicate a major problem for the svn repository for that branch?

Not necessarily.

The conversion is not perfect. It can't be, because we are trying to recreate information we do not have.

It is a heuristic to try to turn cvs commits into changesets. Sometimes it will pull something a little too much forward or backwards, because it happens to fall within the right group.

There is no perfection here, sorry.

--Dan

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]