i trying import svn project git. have following directory structure in svn:
trunk -- aaa -- uuu -- ppp -- qqq in git, want be:
master branch -- aaa -- uuu pq-branch -- ppp -- qqq how achieve while preserving commit history directories?
i tried using git subtree split split ppp , qqq separate branches how delete commit history ppp , qqq master branch?
i tried using filter-branch --tree-filter didn't help.
you can use git svn clone clone different subdirectories separately branches. once have ready, tricky part starts rewrite git history stitch/join 2 branches, aaa , uuu, master , rest branch pq.
you can use git graft or git replace this. careful rewriting git history. can read more information here @ https://git.wiki.kernel.org/index.php/graftpoint or https://git-scm.com/blog/2010/03/17/replace.html.
to find graft point need find last common commit between 2 branches (aaa , uuu) graft point. easiest way find out search commit same timestamp in both branches. once find commit, have graft point
Comments
Post a Comment