unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Network Security Manager merge time?
@ 2014-11-19 16:22 Lars Magne Ingebrigtsen
  2014-11-19 16:40 ` Ted Zlatanov
  2014-11-19 17:28 ` Robert Pluim
  0 siblings, 2 replies; 41+ messages in thread
From: Lars Magne Ingebrigtsen @ 2014-11-19 16:22 UTC (permalink / raw)
  To: emacs-devel

I think the NSM is basically feature complete (i.e., it does what it's
supposed to according to our discussions).  Bugs probably exist, as in
all code.

So perhaps it's time to merge it with trunk?  `nsm-security-level' would
be set to `low', which means that it basically would do nothing.

But we would get more testing of the basic parts -- that I haven't
screwed up Emacs too much.  And then, after a week or so, we could
switch it to `medium', which would activate it, and then we'll see what
people think about the way it works.

Does this sound like a plan?

And it would be nice if somebody more wise in the way of doing large git
merges could do it.  >"?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no





^ permalink raw reply	[flat|nested] 41+ messages in thread

end of thread, other threads:[~2014-12-02 13:50 UTC | newest]

Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-19 16:22 Network Security Manager merge time? Lars Magne Ingebrigtsen
2014-11-19 16:40 ` Ted Zlatanov
2014-11-19 16:53   ` Lars Magne Ingebrigtsen
2014-11-19 17:30     ` Ted Zlatanov
2014-11-19 17:59       ` Lars Magne Ingebrigtsen
2014-11-19 18:34         ` Ted Zlatanov
2014-11-19 20:00           ` Ivan Shmakov
2014-11-19 20:25             ` Ted Zlatanov
2014-11-19 21:41           ` Ted Zlatanov
2014-11-21 11:29             ` Lars Magne Ingebrigtsen
2014-11-25 14:20               ` Ted Zlatanov
2014-11-25 16:30                 ` Lars Magne Ingebrigtsen
2014-11-25 16:46                   ` Ted Zlatanov
2014-11-25 17:08                     ` Lars Magne Ingebrigtsen
2014-11-25 18:20                       ` intrusive changes Ivan Shmakov
2014-11-30 13:51                         ` Stefan Monnier
2014-11-30 15:12                           ` Ivan Shmakov
2014-11-30 18:07                             ` Stefan Monnier
2014-12-02 10:03                               ` Ivan Shmakov
2014-12-02 13:50                                 ` Stefan Monnier
2014-11-19 18:22   ` Network Security Manager merge time? Lars Magne Ingebrigtsen
2014-11-19 20:46     ` Eli Zaretskii
2014-11-19 20:54       ` Lars Magne Ingebrigtsen
2014-11-19 20:58         ` Lars Magne Ingebrigtsen
2014-11-19 21:18         ` Eli Zaretskii
2014-11-20  8:42           ` Lars Magne Ingebrigtsen
2014-11-20 16:16             ` Eli Zaretskii
2014-11-19 17:28 ` Robert Pluim
2014-11-19 17:50   ` Lars Magne Ingebrigtsen
2014-11-19 19:51     ` Robert Pluim
2014-11-19 19:56       ` Lars Magne Ingebrigtsen
2014-11-19 20:06         ` Robert Pluim
2014-11-19 20:20           ` Lars Magne Ingebrigtsen
2014-11-19 20:25             ` Lars Magne Ingebrigtsen
2014-11-19 20:26             ` Robert Pluim
2014-11-19 20:32               ` Lars Magne Ingebrigtsen
2014-11-20  8:00                 ` Robert Pluim
2014-11-20  8:43                   ` Lars Magne Ingebrigtsen
2014-11-20  9:04           ` Robert Pluim
2014-11-20 10:39             ` Lars Magne Ingebrigtsen
2014-11-20 11:34               ` Robert Pluim

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).