Working towards merge of cvs2hg

Greg,

I have spent some time preparing a merge of your cvs2hg back into the
cvs2svn upstream.

I think that the best way to merge the two branches is

1. Work on both sides to make them look as similar as possible, until
the only remaining differences are in cvs2hg-specific code.

2. Slop the remaining diff from the cvs2hg branch onto master in one big
commit or (if somebody is motivated) a short series of logical and neat
commits split out of the diff.

To that end, I have made a few commits on top of my import of your
cvs2hg branch here:

http://repo.or.cz/w/cvs2svn.git/shortlog/refs/heads/cvs2hg

namely

c2a6728 _get_source_groups() already returns a list.
ef1009d Fix merge of upstream r4998.
e6f5885 Merge branch 'master' into cvs2hg
a8893da Fix whitespace errors.

Please tell me if you disagree with any of these.

I have also cherry-picked some more stuff from cvs2hg into master.

4c23aa3 dvcs_common: Change tuple order in _get_source_groups() return
value.
58587e2 dvcs_common: Change _get_source_groups() return value into a list.

Please let me know if you have any comments.

I have one big question: is there a need to preserve a variant of cvs2hg
that generates hg-fast-import data, in addition to your code that works
via the Mercurial Python API?  I'm still a little bit nervous that AFAIK
the Mercurial Python API is not guaranteed to be stable.  This means
that (1) somebody in the cvs2svn project will need to track changes in
the Mercurial API and (2) particular versions of cvs2hg will only work
against a particular range of Mercurial versions.  A hg-fast-import
version might not be so sexy and might not be able to support as many
features, but at least it is working against an interface that is
presumably more stable.

Yours,
Michael

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

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