[Development] [ANNOUNCE] two new git helper scripts

Oswald Buddenhagen oswald.buddenhagen at nokia.com
Fri Nov 18 19:37:21 CET 2011


moin,

as you should now, we have this exceedingly useful collection of git
scripts at https://qt.gitorious.org/qt-labs/devscripts

this collection gained two new little helpers:

- git split-ws splits out the whitespace-only changes from a commit (the
  thing the sanity bot always complains about). after running this
  command you can use git gui (to selectively re-apply changes where the
  script went wrong), stash, commit or simply discard the changes
  (whitespace-only cleanup is frowned upon anyway, unless the code is
  basically unreadable/uneditable).

- git qt-cherry-pick picks commits between the monolithic qt4 repository
  and the modular qt5 repositories. it rewrites paths to avoid spurious
  merge conflicts (git's move detection isn't too helpful when it comes
  to cherry-picks) and contains some policy to find the targets easier.
  it's strongly recommended to have linked object stores between the
  repositories to enable 3-way merges.
  the script isn't as clever as it could be - in particular, it could
  automatically split the commits into pieces for the right
  repositories. perl hackers with some spare time are most welcome.

you also want to keep the repo reasonably current to keep your local
post-commit hook's idea of policy violations in sync with the sanity
bot.

nokians should continue using devtools/shell, which is kept in sync.



More information about the Development mailing list