Problem with vendor branches

Hi,
I'm using cvs2svn (v2.3.0) to migrate our CVS repository to SVN.
I'm having a problem in the handling of vendor branches by cvs2svn.
We've imported iproute2 on a vendor branch on CVS. After the conversion,
I checkout the trunk from CVS and SVN and find some differences.
It seems to be related to the way cvs2svn propagates vendor branches
modifications to the trunk.
You can find below the logs of one file. It seems that on CVS, we have
the 1.1.1.1 revision on the trunk but the 1.1.1.2 revision on SVN.
Any help is appreciated.
Regards,
	Arnaud

*** CVS

[a1@poseidon ip]$ cvs log Makefile

RCS file: /export/commun/cvs_sonde/iproute2/ip/Makefile,v
Working file: Makefile
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        IPROUTE2_2_6_070710: 1.1.1.2
        IPROUTE2_2_2_4_SS001007: 1.1.1.1
        IPROUTE2: 1.1.1
keyword substitution: o
total revisions: 5;     selected revisions: 5
description:
----------------------------
revision 1.1
date: 2006/12/20 15:51:29;  author: a2;  state: Exp;
branches:  1.1.1;  1.1.10;  1.1.30;
Initial revision
----------------------------
revision 1.1.30.1
date: 2009/04/17 14:39:42;  author: a1;  state: Exp;  lines: +7 -0
(AGE-1540) Merge MI branch to MI2 branch - kernel
----------------------------
revision 1.1.10.1
date: 2008/01/09 09:32:01;  author: a3;  state: Exp;  lines: +7 -0
patch EE : Multi-instance support
----------------------------
revision 1.1.1.2
date: 2007/07/18 12:02:10;  author: a2;  state: Exp;  lines: +12 -8
iproute2 2.6.22-070710
----------------------------
revision 1.1.1.1
date: 2006/12/20 15:51:29;  author: a2;  state: Exp;  lines: +0 -0
iproute2 2.2.4-ss001007
========================================================================
=====

[a1@poseidon ip]$ cvs status Makefile
===================================================================
File: Makefile          Status: Up-to-date

   Working revision:    1.1
   Repository revision: 1.1
/export/commun/cvs_sonde/iproute2/ip/Makefile,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -ko


*** SVN

[a1@poseidon ip]$ svn log Makefile
------------------------------------------------------------------------
r945 | a2 | 2007-07-18 14:02:10 +0200 (Wed, 18 Jul 2007) | 2 lines

This commit was generated by cvs2svn to compensate for changes in r944,
which included commits to RCS files with non-trunk default branches.
------------------------------------------------------------------------
r944 | a2 | 2007-07-18 14:02:10 +0200 (Wed, 18 Jul 2007) | 2 lines

iproute2 2.6.22-070710

------------------------------------------------------------------------
r37 | a2 | 2006-12-20 16:51:29 +0100 (Wed, 20 Dec 2006) | 2 lines

iproute2 2.2.4-ss001007

------------------------------------------------------------------------

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2402869

To unsubscribe from this discussion, e-mail: [[email protected]].