Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Ted Zlatanov]

On Sun, 14 Dec 2014 18:09:49 +0200 Eli Zaretskii <address@hidden> wrote: 

EZ> If there is no better workflow, perhaps we need to radically rethink
EZ> our recommended project workflow, like not base it on merges but on
EZ> rebase, or push fixes to master and then cherry-pick them to the
EZ> release branch, or something else.  Because what bzr supported easily
EZ> and almost seamlessly, Git doesn't -- in the sense that emulating the
EZ> same workflow is more complicated and thus error-prone.  To me, this
EZ> spells that we fight the tool, i.e. our workflow should change.

I think cherry-picking fixes from emacs-24 to master or vice-versa is
the best way:

* we tend to make commits in isolation, so there's no need to merge the
  whole branch in one shot.  It's also much less risky as far as
  methodology.

* "cherry-pick -x" will preserve the original commit info

* "git diff" and "git log --cherry-pick" will do what people expect

Ted