From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: Switching to Subversion Date: Tue, 14 Nov 2006 07:31:07 +0900 Message-ID: <874pt3vv10.fsf@catnip.gol.com> References: <87bqne87ur.fsf@catnip.gol.com> <10609.1163264429@olgas.newt.com> <87fycphhyr.fsf@pacem.orebokech.com> <87odrdzci9.fsf@olgas.newt.com> <87ac2w45e0.fsf@catnip.gol.com> <20061113114350.GA28313@intevation.de> Reply-To: Miles Bader NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1163457105 32624 80.91.229.2 (13 Nov 2006 22:31:45 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 13 Nov 2006 22:31:45 +0000 (UTC) Cc: Juanma Barranquero , Bill Wohler , rms@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 13 23:31:40 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GjkKt-0002SE-3x for ged-emacs-devel@m.gmane.org; Mon, 13 Nov 2006 23:31:27 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GjkKs-0003dx-Ei for ged-emacs-devel@m.gmane.org; Mon, 13 Nov 2006 17:31:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GjkKh-0003bS-OL for emacs-devel@gnu.org; Mon, 13 Nov 2006 17:31:15 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GjkKf-0003YY-S4 for emacs-devel@gnu.org; Mon, 13 Nov 2006 17:31:15 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GjkKf-0003YN-L0 for emacs-devel@gnu.org; Mon, 13 Nov 2006 17:31:13 -0500 Original-Received: from [203.216.5.72] (helo=smtp02.dentaku.gol.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1GjkKe-0002aV-0Z; Mon, 13 Nov 2006 17:31:12 -0500 Original-Received: from 203-216-98-080.dsl.gol.ne.jp ([203.216.98.80] helo=catnip.gol.com) by smtp02.dentaku.gol.com with esmtpa (Dentaku) id 1GjkKa-0007G1-Sz; Tue, 14 Nov 2006 07:31:08 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 1BB442F43; Tue, 14 Nov 2006 07:31:07 +0900 (JST) Original-To: Sascha Wilde System-Type: i686-pc-linux-gnu In-Reply-To: (Sascha Wilde's message of "Mon\, 13 Nov 2006 15\:46\:28 +0100") Original-Lines: 24 X-Abuse-Complaints: abuse@gol.com 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:62254 Archived-At: Sascha Wilde writes: >> I tried to use mercurial a long time ago, and noticed it seemed to have >> only very poor renaming support -- renames basically seemed to show up >> as delete+add (mind you git's not all that great either in that sense). > > This was much improved recently. You can rename/move files around in a > mercurial repository and the files history will be preserved. That's good to hear. One point which concerns me with is how renaming interacts with merging -- that's one reason why representing a rename as del+add is problematic. For instance, if I rename A->B, and then later merge a branch where the author made a change to A ... what happens? What if I rename A->B, and then merge a branch where the author renamed A->C and made changes to C? Thanks, -Miles -- Suburbia: where they tear out the trees and then name streets after them.