Stop the git abuse

[Stanislav Ochotnicky]

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

If the branches are in sync you just saved yourself few minutes. More
importantly you have saved other people like me heap of time because I
will not have to wonder what is different in each branch suddenly. Hint:
in 99% cases nothing. It could still nice linear history. And then there
are those gems where while doing manual fixes you introduce typos and
bugs (yes, it happenes).

Example: http://sochotni.fedorapeople.org/ugly-git-history.png
F16, F17 and rawhide could be the same commmit and just few commits
ahead of F15. But the way it was done, it's not obvious that F17 has a
typo causing problems.

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

Thanks,

-- 
Stanislav Ochotnicky <sochotnicky at redhat.com>
Software Engineer - Base Operating Systems Brno

PGP: 7B087241
Red Hat Inc.                               http://cz.redhat.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: signature
URL: <http://lists.fedoraproject.org/pipermail/devel/attachments/20120518/1e59034c/attachment.sig>