Re: Headache caused by svn svn migration

Greg Ward wrote:
> On Tue, Jul 27, 2010 at 9:15 AM, Michael Haggerty <[email protected]> wrote:
>> BTW, I believe that r5134, r5135, and r5136 are merges of changes from
>> your cvs2hg repository.  Don't be surprised if there are merge conflicts
>> on those patches.
> 
> Not a problem.  Mercurial knows how to track merges.  ;-)

Yes, except that Mercurial doesn't know that they are merges because the
merging was done external to Mercurial.

> The real
> nightmare will be turning my hg history into a nice linear sequence of
> patches that you guys can process easily.  I started that last year,
> but have been busy with other things since then.

I think I will have some time over the next few weeks to help on this.
If we can get even part of your changes merged upstream, it would be
progress.  And if we can un-fork the project entirely, it would save a
lot of user confusion and development effort.

Is there any chance of getting you to use hg-git to interact with the
git mirror of the cvs2svn project at

    ssh://repo.or.cz/srv/git/cvs2svn.git

so that we can collaborate with merge-aware goodness?

Michael

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

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