-=| Thorsten Glaser, 15.02.2014 22:30:38 +0000 |=- > Damyan Ivanov dixit: > > >> > This suggested that there's additional history that I'd like to have, > >> > but retrieving it fails: > >> [snip] > >> > Perhaps git-cvsimport is not happy about the module rename or the > >> > history is just not available anymore. > > Oops. Sorry. > > >I guess that could work, although mirroring the whole contrib/hosted > >tree of the mirbsd's CVS seems like a nuclear approach. Thorsten, what > >do you think? Would I get an IP ban if I try that? :) > > No, you can just do that in one rsync call, and it’s not that big, > but still overkill. You can normally just download both ,v file trees > and put them together – asides from the CVSROOT/ directory, in CVS, > every file is fully self-contained, and they can be moved between > repositories or even accessed using RCS (official) or $EDITOR (not > quite official but it’s a fully-documented plaintext format). > > Judging from the ,v files themselves I didn’t do a move but a copy > of the checked-out tree (possibly adjusting paths in the files as I > went) and a removal of the original tree. In this case, you can just > convert them both to git then stitch them together (BTDT, I first put > them into the same repo as different branches (in your case, all three > of them, pre-move post-move and the current git tree) then used a > .git/info/grafts file until it “looked good” in e.g. gitk, then used > a git rebase to persist the changes from the grafts file and took > care of moving the tags to the rebased sha1s). > > Sorry about the trouble. If needed, I can have a look at doing such > a convert+stitch operation myself.
I would be very grateful if you could handle that. Just converting the
pre-move commits to Git would be enough. That will give me three git
repositories (pre-move, post-move, post-takeover) that I could replay
one after another.
Thanks!
dam
signature.asc
Description: Digital signature
