From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sat, 15 Nov 2014 18:32:39 +0200 Message-ID: <837fywfmqg.fsf@gnu.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <54677406.8030907@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416069202 416 80.91.229.3 (15 Nov 2014 16:33:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:33:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:33:15 2014 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 1XpgHe-0007ZK-Sa for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:33:11 +0100 Original-Received: from localhost ([::1]:41041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgHe-0001Oy-Eb for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:33:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgHV-0001In-L2 for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:33:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpgHP-0005Yf-Jh for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:33:01 -0500 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:39519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgHP-0005YV-By for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:32:55 -0500 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NF300F009DKRL00@mtaout29.012.net.il> for emacs-devel@gnu.org; Sat, 15 Nov 2014 18:31:08 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF300BI39VWV150@mtaout29.012.net.il>; Sat, 15 Nov 2014 18:31:08 +0200 (IST) In-reply-to: <54677406.8030907@cs.ucla.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:177201 Archived-At: > Date: Sat, 15 Nov 2014 07:40:54 -0800 > From: Paul Eggert > > To be honest, I never used bzrmerge.el the few times that I merged, and I doubt > whether anybody noticed. If you didn't have to deal with commits that are marked "backported" or "don't merge to trunk", then the merge is a trivial VCS job, and indeed doesn't need any help. Otherwise, bzrmerge.el saves a lot of manual, error-prone typing, no more, no less. > More generally, I sense that there's a tension here between having the > repository reflect the actual history of changes, warts and all, and having the > repository reflect the history of changes in a nice tidy organized way. Having > done a fair bit of software archeology myself I must say that I far prefer the > former. (Plus, it's less work for the non-archeologists....) I don't think bzrmerge changed anything in this department.