unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Kaushal Modi <kaushal.modi@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: nyraghu27132@gmail.com, johnw@gnu.org, emacs-devel@gnu.org
Subject: Re: pdf-view removed from mailcap.el
Date: Sun, 17 Sep 2017 14:59:16 +0000	[thread overview]
Message-ID: <CAFyQvY0m1afbtzasw7OW0eYaS72EJw56qw-0T8Wh2JA4MuZd3w@mail.gmail.com> (raw)
In-Reply-To: <838thdjsrt.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

On Sun, Sep 17, 2017, 10:37 AM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Kaushal Modi <kaushal.modi@gmail.com>
> > Date: Sun, 17 Sep 2017 13:52:47 +0000
> >
> > Shouldn't each commit made to the stable branches be merged to master at
> the same
> > time?
>
> It would be nice, but it is not required.


It would be great if it is encouraged then.

 Merging

from the release
> branch to master usually requires some manual work, and is sometimes
> not for the faint at heart.
>

If each committer makes sure to merge their commit, others don't have to
review if they are merging others' commits correctly. I can talk of my
experience in Org repo.. after my commits to the maint branch, all I need
to do is check out master and do a merge.. as simple as this in Magit: "b
b" (checkout master) "m m" (merge maint).

> I like that kind of flow in the Org repo. Notice how each time commits
> made to maint (Org stable) branch are
> > followed by merge commits to master:
> http://orgmode.org/cgit.cgi/org-mode.git/log/
>
> An example to follow, I'm sure.  Maybe we could have someone volunteer
> to be our "merge champion"?
>

One doesn't need to be a "champion" as they are just making sure that their
commit is landing in master too.

Would you consider documenting and at least recommending this flow?

Thanks.

> --

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 2702 bytes --]

  reply	other threads:[~2017-09-17 14:59 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-17 10:37 pdf-view removed from mailcap.el N. Raghavendra
2017-09-17 12:30 ` Mark Oteiza
2017-09-17 13:38   ` N. Raghavendra
2017-09-17 13:49     ` Óscar Fuentes
2017-09-17 14:13       ` N. Raghavendra
2017-09-17 14:39         ` Eli Zaretskii
2017-09-17 14:41           ` N. Raghavendra
2017-09-17 16:55             ` Eli Zaretskii
2017-09-17 18:27               ` N. Raghavendra
2017-09-17 19:00                 ` Eli Zaretskii
2017-09-17 13:52     ` Kaushal Modi
2017-09-17 14:37       ` Eli Zaretskii
2017-09-17 14:59         ` Kaushal Modi [this message]
2017-09-17 15:37           ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAFyQvY0m1afbtzasw7OW0eYaS72EJw56qw-0T8Wh2JA4MuZd3w@mail.gmail.com \
    --to=kaushal.modi@gmail.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=johnw@gnu.org \
    --cc=nyraghu27132@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).