[hibernate-dev] Applying commits from 3.6 to master

[Adam Warski]

After some tries, here's my workflow for applying commits from the 3.6 branch to the master branch:
1. Commit to 3.6 :)
2. Create patches for the commits using git format-patch commit sha/range etc. This will produce numbered patches.
3. Switch to master
4. Modify the patches using the following script:

#!/bin/bash
for file in $*
do
        sed 's/\/envers\//\/hibernate-envers\//' < $file > mod_$file
done

(substitute envers with the appropriate module)

5. Apply the patches using git am <file>
6. Done

Not very straightforward, but works. And maybe somebody will find a better way :)

-- 
Adam Warski
http://www.warski.org
http://www.softwaremill.eu