From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w Date: Sat, 19 Feb 2011 18:31:25 +0900 Message-ID: <871v34pdzm.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83tyg5vyvr.fsf@gnu.org> <83sjvowrfd.fsf@gnu.org> <83pqqrx3pc.fsf@gnu.org> <83fwrnwxvp.fsf@gnu.org> <83d3mrwuv9.fsf@gnu.org> <838vxfwbqc.fsf@gnu.org> <83y65dvfqh.fsf@gnu.org> <83ei75ust0.fsf@gnu.org> <83wrkwtobv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1298107755 2774 80.91.229.12 (19 Feb 2011 09:29:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 19 Feb 2011 09:29:15 +0000 (UTC) Cc: cyd@stupidchicken.com, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 19 10:29:10 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pqj7g-0005mg-Oy for ged-emacs-devel@m.gmane.org; Sat, 19 Feb 2011 10:29:07 +0100 Original-Received: from localhost ([127.0.0.1]:52802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pqj7Z-0002rc-Hs for ged-emacs-devel@m.gmane.org; Sat, 19 Feb 2011 04:28:57 -0500 Original-Received: from [140.186.70.92] (port=44905 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pqj7N-0002o8-8W for emacs-devel@gnu.org; Sat, 19 Feb 2011 04:28:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pqj7H-0000FV-GQ for emacs-devel@gnu.org; Sat, 19 Feb 2011 04:28:40 -0500 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:38050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pqj7F-0000Ej-GW; Sat, 19 Feb 2011 04:28:37 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id 4ED92970659; Sat, 19 Feb 2011 18:28:34 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 669341A2922; Sat, 19 Feb 2011 18:31:25 +0900 (JST) In-Reply-To: <83wrkwtobv.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta29) "garbanzo" ed3b274cc037 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 130.158.97.224 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:136222 Archived-At: Eli Zaretskii writes: > I wonder if we can invent some way of doing this without relying on > people's memory so much. Or at least have a way of doing something > _after_ the commit to help the merge, if I do forget. I think I've suggested this before, but AFAIK svnmerge.py is a good tool for this, if you're using svn. The Python folks are planning to port it to Mercurial, so it should also be port-able to Bazaar. I do not know how much code and/or delicate design is involved (I've never needed such a tool in my own work), but presumably something similar could be done in Emacs Lisp if requiring Yet Another 3rd-Party Tool doesn't float your boat.