Nico --
> | * Submit patches with the "rake email_patches" rake task, rather than
> | as an attachment; inline patches are much more likely to get read and
> | commented on.
>
> Same thing :) As my first "git format-patch" produced 4838 patches I don't
> know
> what would have happened ;)
The trick to this (which I learned the hard way) is to make absolutely
sure that the middle segment of your branch name is the version you
based it on. For example, if you start your branch with:
git checkout master
git checkout -b feature/_____/foo
the "______" part MUST be the word "master". This is because "rake
mail_patches" sends all the changes between the branch and it's base,
which it extracts from the branch name. So:
git checkout master
git checkout -b feature/master/foo
and you're fine, while:
git checkout 0.24.9
git checkout -b feature/master/foo
(or visa versa) and you'll be sending al the changes in the past year
or two to the list.
If you need to recover a branch that got off on the wrong foot you can:
1) Do a "git log" of your branch and note the SHAs (hex tags) of the
commits you care about
2) move the branch to a new name (say, temp) with "git -m new_name"
3) start a new branch with the proper name, based off what it should be
4) use "git cherrypick" to add the commits from the old branch to the
new one, one at a time, in the order they were created (e.g. reverse
of the order log lists them), resolving any conflicts as they arise
5) If all goes well and you like the result, you can delete your temp
branch with "git -d temp"; if not, you can delete your new branch and
move temp back to where it was.
>
> My ruby-fu needs improvement :) and I'm glad for the tips :)
And we're glad for the patch, so all is as it should be. :)
-- Markus
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
