Re: Headache caused by svn svn migration

On Sun, Aug 8, 2010 at 1:10 PM, Michael Haggerty <[email protected]> wrote:
> With a combination of hg-git, git-svn, git grafts, and git
> filter-branch, I just created a grand unified cvs2svn repository
> containing all of the commits from the cvs2svn Subversion repository,
> your cvs2hg commits, and the proper ancestry information linking it all
> together.  The result is in
>
>    http://repo.or.cz/w/cvs2svn.git
>
> Your work is contained in the "cvs2hg" branch, which can be viewed by
> clicking on the "cvs2hg" link at the bottom of that page.

Cool!  I know how much trouble that sort of meta-integration can be --
nice work.

(BTW, sorry I didn't notice this earlier; your message has been
sitting in an out-of-the-way folder since just before I went on
vacation in August.  I still haven't caught up with my email from
then.)  (OTOH, who am I kidding?  I still haven't caught up with email
from 2001.)

> The only thing that doesn't match up 100% between the pseudo-upstream
> commits from your Mercurial repository and the ones in this repository
> is that they updated the "svntest" directory at different times.  But
> this difference should not matter in practice.

Nah, should be irrelevant.

> It would be great if you would work with this repository so that we can
> work together with decent tools rather than copy and pasting patches
> around.  For quite some time I have been pushing Subversion's trunk
> revisions to this repo on a regular basis, so you could use it for
> syncing with upstream.

Sure.  All I have left to do to cvs2hg is satisfy Max's request that
dummy merges of tag fixup commits should be truly artificial, not
implicitly done as part of a converted CVS commit.  Ongoing, of
course, I'll try to keep on top of Mercurial API changes.  But there's
really nothing serious left to do (unless someone offers to pay me to
do it).

> A word about git vs hg: there is an "hg-git" tool, but no "git-hg" tool.
>  Therefore, it seems like the only way to work with git and hg at the
> same time is to use a shared git repository that can be pulled and
> pushed to from either git or hg.  According to the hg-git website [1],
> all you should need to do to get started is
>
>    $ hg clone git://repo.or.cz/cvs2svn.git
>
> If you want to submit patches and pull requests via Mercurial, then you
> should fork the git project (i.e., make one that is writable by you) and
> push from Mercurial into that repository using hg-git.
>
> I believe that the git repository is equivalent to your Mercurial
> repository, but they are not compatible in the sense that the hashes are
> different.  So after you clone, you might want to replace your public
> Mercurial repo with the cloned version.

Hmmm.  If I'm the only one who has to use hg-git, that's fine.  But I
don't want to put any barriers in the way of people getting the code.
Figuring cvs2xxx out is hard enough, so getting it should be as simple
as "hg clone ...".

Greg

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

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