Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Monorepo fixup] Reset lld contents in the swift/master branch to mat… #9

Closed
wants to merge 1 commit into from

Commits on Oct 21, 2019

  1. [Monorepo fixup] reset untracked directory contents to match apple/st…

    …able/20190619
    
    The monorepo conversion for the swift/master branch brought in contents in
    untracked directory that landed after the apple/stable/20190619 branch was cut.
    
    This commit fixes this content by resetting the sub-trees to match apple/stable/20190619.
    
    Here's how this commit was contructed:
    
    Step 1: reset the subtrees to match the apple/stable/20190619 state
    
    repos="debuginfo-tests libclc libcxxabi libunwind lld llgo openmp parallel-libs polly pstl"
    
    for repo in $repos
    do
      git rm -rf $repo > /dev/null
      latest_commit=$(git rev-list HEAD -n1 -- $repo)
      tree=$(git rev-parse origin/apple/stable/20190619:$repo)
      git read-tree --prefix=$repo $tree
      echo "LATEST COMMIT FOR $repo -p $latest_commit"
    done
    
    Step 2: construct an octopus merge commit with new subtrees
    
    tree=$(git write-tree)
    git commit-tree -p HEAD -p ... -m "[Monorepo fixup] ..." $tree
    hyp committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    e62327a View commit details
    Browse the repository at this point in the history