Ignore the bats/ directory cloned by tests #286
Conversation
|
👍 |
|
Importing updates from rbenv / ruby-build is really hard... 😞 |
Ignore the bats/ directory cloned by tests
I can imagine that. But then there's no common Git ancestor, is there? Then future merges could be as easy as "git merge rbenv/master". For comparing directory trees, I can recommend http://www.scootersoftware.com/, which allows to have "unimportant" differences. HTH |
|
Oh, there appears to be some common ancestor at least, If merged properly once, they should work in the future? |
|
Hmm, |
|
There is not common ancestor changeset between sstephenson/rbenv and pyenv. I didn't know Anyway, we have to prepare comprehensive tests for pyenv specific features (e.g. multi versions) before automating merges.... |
|
I do not mean to have automatic merges, but to create a common ancestor now: if you think everything has been merged, then "git merge -s ours rbenv/master". But somehow we would need to make git aware of the renaming from rbenv to pyenv, too. |
This merges https://github.com/sstephenson/rbenv/commits/4d72eefffc548081f6eee2e54d3b9116b9f9ee8e to build a common ancestor for future merges. The last manual merge was in f48a5b1. Discussion / initial idea: #286 (comment) This was done using: # Keep our changes for "unmerged, both added" for i in $(git status --porcelain | grep '^AA ' | cut -d\ -f2); do git checkout --ours $i git add $i done # "git mv" rbenv files to our name, keeping the current contents. for i in $(git status --porcelain | grep '^A ' | sed 's/^A //'); do ours=${i//rbenv/pyenv} test -f $ours || { echo "Skipping: $i"; continue; } git mv -f $i $ours git reset HEAD $ours done I've handled the following then manually: - rbenv.d/exec/gem-rehash.bash - rbenv.d/exec/gem-rehash/rubygems_plugin.rb This should allow to merge rbenv in the future using: git merge rbenv/master -s recursive -X rename-threshold=5% I am not sure about the rename-threshold, 25% also worked for one file I've tested. Conflicts: .gitignore .travis.yml LICENSE README.md src/Makefile.in test/--version.bats test/commands.bats test/completions.bats test/exec.bats test/global.bats test/help.bats test/hooks.bats test/init.bats test/local.bats test/prefix.bats test/rehash.bats test/run test/shell.bats test/shims.bats test/test_helper.bash test/version-file-read.bats test/version-file-write.bats test/version-file.bats test/version-name.bats test/version-origin.bats test/version.bats test/versions.bats test/whence.bats test/which.bats
This merges https://github.com/sstephenson/rbenv/commits/4d72eefffc548081f6eee2e54d3b9116b9f9ee8e to build a common ancestor for future merges. This is branched off f48a5b1, which was the last manual merge. Discussion / initial idea: #286 (comment) This was done using: # Keep our changes for "unmerged, both added" for i in $(git status --porcelain | grep '^AA ' | cut -d\ -f2); do git checkout --ours $i git add $i done # "git mv" rbenv files to our name, keeping the current contents. for i in $(git status --porcelain | grep '^A ' | sed 's/^A //'); do ours=${i//rbenv/pyenv} test -f $ours || { echo "Skipping: $i"; continue; } git mv -f $i $ours git reset HEAD $ours done I've handled the following then manually: - rbenv.d/exec/gem-rehash.bash - rbenv.d/exec/gem-rehash/rubygems_plugin.rb This should allow to merge rbenv in the future using: git merge rbenv/master -s recursive -X rename-threshold=5% I am not sure about the rename-threshold, 25% also worked for one file I've tested. Conflicts: .gitignore .travis.yml LICENSE README.md src/Makefile.in test/--version.bats test/commands.bats test/completions.bats test/exec.bats test/global.bats test/help.bats test/hooks.bats test/init.bats test/local.bats test/prefix.bats test/rehash.bats test/run test/shell.bats test/shims.bats test/test_helper.bash test/version-file-read.bats test/version-file-write.bats test/version-file.bats test/version-name.bats test/version-origin.bats test/version.bats test/versions.bats test/whence.bats test/which.bats
No description provided.