[issue704] convert: CVS importer sometimes finds the wrong branch parent

Brendan Cully mercurial-bugs at selenic.com
Thu Aug 23 15:02:50 CDT 2007


New submission from Brendan Cully <brendan at kublai.com>:

Here's some cvsps output demonstrating the problem. In this case, the parent of
patchset 3 should be 1, not 2. In 2, mainline has file revision 1.2, but in 3,
the start revision is 1.1.

Unfortunately, the CVS importer ignores the file entries and simply uses the
latest revision on the ancestor branch. I guess to get the parent revision right
it would have to parse the file revisions of each member.

---------------------
PatchSet 1
Date: 2007/08/23 04:44:04
Author: brendan
Branch: HEAD
Tag: mainline-1
Log:
Add mainline

Members:
        mainline:INITIAL->1.1

---------------------
PatchSet 2
Date: 2007/08/23 04:46:32
Author: brendan
Branch: HEAD
Tag: mainline-2
Log:
V2

Members:
        mainline:1.1->1.2

---------------------
PatchSet 3
Date: 2007/08/23 04:47:55
Author: brendan
Branch: branch-1
Ancestor branch: HEAD
Tag: b1
Log:
mod b1

Members:
        mainline:1.1->1.1.2.1

---------------------
PatchSet 4
Date: 2007/08/23 04:48:26
Author: brendan
Branch: branch-1
Tag: b2
Log:
mod b2

Members:
        mainline:1.1.2.1->1.1.2.2

----------
messages: 3902
nosy: brendan
priority: bug
status: unread
title: convert: CVS importer sometimes finds the wrong branch parent
topic: convert

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue704>
____________________________________________________



More information about the Mercurial-devel mailing list