tools: a simple git.mergetool for working with buildout.hash.cfg
Rewriting commit history with git rebase -i always caused some
conflicts on md5sum of modified files. update-hash made all this
easier, because we could just revert buildout.hash.cfg, re-run
update-hash and commit the changes.
This tool makes this scenario a bit more user friendly by automating the steps by running as a git mergetool.
An interactive rebase session can be initiated by running this command from software/*/ directory:
git rebase -i --exec "$(pwd)/../../update-hash $(pwd)/buildout.hash.cfg" origin/master
and if conflict occur, run:
git mergetool --tool update-hash-mergetool && EDITOR=cat git rebase --continue
This way, rebase session can be almost non interactive (still have to run the above mergetool command) when conflicts are only on md5sum updates.
-
This approach might be wrong, I have to use it a bit more to confirm there's no problem.
/cc @vpelletier
-
For me you can merge this one...
-
I think there's a very little risk of breaking anything, if we merge this.
Could you try, is it working for you ?
I forgot what @vpelletier said exactly, maybe we were waiting for him to have chance to try.
-
I also forgot what we said. FWIW, I did not try it yet myself (because I'm not very active on SR development lately). I believe this should be fine to merge.
-
Status changed to merged
Toggle commit list -
An interactive rebase session can be initiated by running this command from software/*/ directory:
git rebase -i --exec "$(pwd)/../../update-hash $(pwd)/buildout.hash.cfg" origin/masterAfter some use, I find it better to run this way, if the rebase involves multiple buildout.hash.cfg
git rebase -i --exec './update-hash $(find . -name buildout.hash.cfg)' origin/master
-
Please register or sign in to post a comment