Stop the git abuse

Sérgio Basto sergio at serjux.com
Fri May 18 20:25:44 UTC 2012


On Sex, 2012-05-18 at 18:35 +0200, Stanislav Ochotnicky wrote: 
> I've been seeing this ugliness more and more to the point where I just
> can't keep writing individual emails. Repeat after me: git is not CVS.
> 
> When you have 2 branches with identical content and history (typically
> right after branching or when the maintainer is updating all releases
> together) then DO NOT manually redo fix for every branch. Do not even
> use cherry-pick! Just *merge* for the love of whatever is holy to you.
> 
> $ git checkout master (or fedpkg switch-branch)
> ... do a fix, test, commit, build etc...
> $ git checkout f17 
> $ git merge master
> $ git/fedpkg push && fedpkg build
> DONE

this git process is describe here: 
http://fedoraproject.org/wiki/Join_the_package_collection_maintainers#Update_Your_Branches_.28if_desired.29


but should also be in http://fedoraproject.org/wiki/Package_update_HOWTO
or maybe better, where :
https://fedoraproject.org/wiki/Using_git_FAQ_for_package_maintainers#How_do_I_import_a_SRPM_package.3F


> 
> So please. Merge as long as it makes sense (i.e. unless something needs
> to be changed specifically in one branch).
> 
> Thanks,
> 

Thanks,
-- 
Sérgio M. B.



More information about the devel mailing list