From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: RCS, again: another removed functionality: undo last-checkin Date: Mon, 21 Sep 2015 09:13:02 -0400 Message-ID: References: <87oagx6tzz.fsf@mat.ucm.es> <55FF4026.2050004@yandex.ru> <83si68nu4i.fsf@gnu.org> <87eghsfd3m.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442841219 14650 80.91.229.3 (21 Sep 2015 13:13:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Sep 2015 13:13:39 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, Dmitry Gutov To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 21 15:13:23 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ze0uJ-0000dG-1L for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 15:13:23 +0200 Original-Received: from localhost ([::1]:58322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0uI-0001l7-JF for ged-emacs-devel@m.gmane.org; Mon, 21 Sep 2015 09:13:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0uF-0001ku-IE for emacs-devel@gnu.org; Mon, 21 Sep 2015 09:13:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ze0uA-0001F8-2V for emacs-devel@gnu.org; Mon, 21 Sep 2015 09:13:19 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:11818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0tz-00017r-6C; Mon, 21 Sep 2015 09:13:03 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AyFgA731xV/2yixEVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLDiYSFBgNJIg3CM8jAQEBAQYCAR+LOoUFB4QtBbM/gUUjYYMzIoJ4AQEB X-IPAS-Result: A0AyFgA731xV/2yixEVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLDiYSFBgNJIg3CM8jAQEBAQYCAR+LOoUFB4QtBbM/gUUjYYMzIoJ4AQEB X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="165429422" Original-Received: from 69-196-162-108.dsl.teksavvy.com (HELO pastel.home) ([69.196.162.108]) by ironport2-out.teksavvy.com with ESMTP; 21 Sep 2015 09:13:02 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 49B14627AF; Mon, 21 Sep 2015 09:13:02 -0400 (EDT) In-Reply-To: <87eghsfd3m.fsf@fencepost.gnu.org> (David Kastrup's message of "Mon, 21 Sep 2015 09:25:33 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:190189 Archived-At: [ Sending in private, it's only for information. ] > LilyPond works with a "staging" branch and a "master" branch. "master" > only moves forward: once a commit is in there, it stays. If its effects > are to be annulled, it is reverted. Nobody pushes to master though. > Any changes are instead pushed to staging. An automated task picks up Sounds like an attractive organization. One question, tho: how do you deal with (aka "synchronize") concurrent "push" to the staging branch, if you allow the staging branch to be "forced" (either via non-FF, or via remove+push)? Stefan