As part of the SVN→Git migration process I'm deprecating the pending
task lists at http://wiki.wireshark.org/Development/Roadmap. If you want
to backport a change, please cherry-pick it in Git and push it to
code.wireshark.org/review. The new process is:
- Check out the release branch, e.g. master-1.10
- Find the change in master that you want to merge:
git log origin/master
- Cherry pick it:
git cherry-pick <hash>
- Push the change to Gerrit:
git push origin HEAD:refs/for/master-1.10/backport-r45678
I tried to automate as much of this as possible in
trunk:tools/backport-change but for some reason the commit hook script
isn't adding the Gerrit change ID.
Also, we had a minor mishap. I was pushing changes from the plain Git
repository to Gerrit repository too aggressively (by using "git
--mirror"). This clobbered changes that had been uploaded to Gerrit.
Fortunately only the first three were affected.
