From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch) Date: Fri, 25 Dec 2015 15:35:30 -0800 Message-ID: References: <8337urm0cv.fsf@gnu.org> <83ziwzkl50.fsf@gnu.org> <87lh8jvsqh.fsf@fencepost.gnu.org> <83si2qliho.fsf@gnu.org> <83d1tulaa1.fsf@gnu.org> <838u4il3jf.fsf@gnu.org> <83y4cijo24.fsf@gnu.org> <83twn6jm7e.fsf@gnu.org> <87twn686cn.fsf@isaac.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451086563 1098 80.91.229.3 (25 Dec 2015 23:36:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 25 Dec 2015 23:36:03 +0000 (UTC) Cc: Eli Zaretskii , larsi@gnus.org, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 26 00:35:55 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 1aCbtq-0007VZ-F5 for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 00:35:54 +0100 Original-Received: from localhost ([::1]:36862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbtp-0004Kq-JM for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 18:35:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbtc-0004KY-AL for emacs-devel@gnu.org; Fri, 25 Dec 2015 18:35:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCbtb-0007C1-Bm for emacs-devel@gnu.org; Fri, 25 Dec 2015 18:35:40 -0500 Original-Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]:35796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCbtW-00076O-1P; Fri, 25 Dec 2015 18:35:34 -0500 Original-Received: by mail-pf0-x231.google.com with SMTP id 78so83098292pfw.2; Fri, 25 Dec 2015 15:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=Q/HoxYpyxhs5CqSkq9A84oYNzKbbNm+4NJachaXGJQw=; b=LpmJ1E7YxK9SlClj64tBurjGtnOYpRG6o//XJBkKkN21Hytokl5OOUWDHbVPIfZYm/ buPt/0uWIlwhMaApbWlYrzy8xy3YXWX0/FLiMqMxdVa4nT0dMsIpoXcoYkDCmeN1nABa 2s6ftORTpdKaWXnXQtk5cZujd7RLeq4iwyxmzgqSDx6LhPz9EZ2yi5NvNkGiPLE/wS2J tX1pm53mgjcUZkp07hGQNBulODj2njjYlU7oqeIMlb425bS6dPCSfkSQQmPfFPOdyyqf R0inySQFJJfm178SiMCzQQUUcz8G65686VigBxkEKaCfZcSsPMSc8Gdg/FIBXX47TDuT Dk7A== X-Received: by 10.98.80.138 with SMTP id g10mr61812755pfj.25.1451086533452; Fri, 25 Dec 2015 15:35:33 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id e67sm31976128pfd.7.2015.12.25.15.35.32 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Dec 2015 15:35:32 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 21BEB11B4FEC3; Fri, 25 Dec 2015 15:35:32 -0800 (PST) In-Reply-To: <87twn686cn.fsf@isaac.fritz.box> (David Engster's message of "Sat, 26 Dec 2015 00:18:48 +0100") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: David Engster , Eli Zaretskii , larsi@gnus.org, emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::231 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:196871 Archived-At: >>>>> David Engster writes: > gitmerge.el will detect cherry-picks through the cherry-mark. However, since > git is the C++ of version control, this works only 99% of the time. It does > not work when the cherry-pick could not be applied cleanly, since then the > patch-id changes. It also does not work when the same commit is also merged > later (see the beginning of the emacs-25 branch for an example, where first > a bunch of commits was cherry-picked and later 'master' was also merged). OK, that's understandable. What I'd like to avoid -- as much as feasible -- is having so much of a custom merge process, apart from what most other projects using Git do, that it becomes difficult to teach newcomers about our process. I've used Git in many scenarios, on many projects, but some of the practices we're using here for Emacs development I've never seen before. This simply makes me wonder how much of that difference is truly necessary, or is a result of having evolved to this point from CVS and then Bazaar. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2