lite icon indicating copy to clipboard operation
lite copied to clipboard

Split history imported with git subtree add --squash

Open dxops opened this issue 9 years ago • 1 comments

For now we have monolithic repository with added subtree (~45k commits) repository using squash option, like

Add 'package/' from commit 'hash'
git-subtree-dir: package
git-subtree-mainline: hash
git-subtree-split: hash

Any of --git values creates ~3k commits only

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress --git="<1.8.2"
3115 commits created, 97916 commits traversed, in 4.132s
45edc1a3dc374172538b3ed41964cbaedcc19c66

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress --git="<2.8.0"
3115 commits created, 97916 commits traversed, in 4.246s
240c137ba401897ef2a7e224af6e05895673dabf

../go/splitsh-lite --prefix=package --target=heads/subtree_go --scratch --progress
3164 commits created, 97916 commits traversed, in 5.313s
c0d65fd26c485144a42fcf073422289a0dba5822

Is it possible to attach created commits to subtree history to be able to push changes back into repository without conflicts and forced push?

dxops avatar Aug 01 '16 17:08 dxops

+1 for this issue

iklymenko avatar Aug 22 '16 10:08 iklymenko