[PATCH] convert: added cvsnt mergepoint support

[Greg Ward]

On Thu, Apr 2, 2009 at 4:33 AM, Henrik Stuart <henrik.stuart at edlund.dk> wrote:
> It is, unfortunately, not possible to use the ,v files in a
> non-mergepoint aware CVS implementation and still get the mergepoint
> information in ,v files.

Bummer.  I suspected as much.

> Adding it as a separate unit test-like thing is a tad difficult at best,
> since all the parsing is happening in cvsps.py:createlog, which also
> invokes "cvs rlog".

It would be nice if we could add unit tests for cvsps.py, but it would
take some refactoring to make that happen.  As I'm sure you noticed.
;-)

> As a slightly hacked possibility, it would be
> possible to place a bogus cvs command in the path and just let it
> return a pre-defined rlog. I'm not sure how nice a solution this is
> either.

What a disgusting hack.  I love it!  A trick like that would make the
cvs conversion tests much faster, and less dependent on the whims of
whatever the local "cvs" happens to be.

The trick is: after cvsps has figured out the changesets, how do you
fake getting the file contents?  Hmmm.

Greg