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: Switching to Subversion Date: Tue, 14 Nov 2006 01:38:38 -0500 Message-ID: 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> <874pt3vv10.fsf@catnip.gol.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1163486369 9275 80.91.229.2 (14 Nov 2006 06:39:29 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 14 Nov 2006 06:39:29 +0000 (UTC) Cc: Sascha Wilde , Juanma Barranquero , emacs-devel@gnu.org, Bill Wohler , rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 14 07:39:21 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 1Gjrwt-0002WC-UL for ged-emacs-devel@m.gmane.org; Tue, 14 Nov 2006 07:39:12 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gjrwt-0003Qk-FI for ged-emacs-devel@m.gmane.org; Tue, 14 Nov 2006 01:39:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Gjrwb-0003QQ-0l for emacs-devel@gnu.org; Tue, 14 Nov 2006 01:38:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GjrwW-0003OM-4Y for emacs-devel@gnu.org; Tue, 14 Nov 2006 01:38:52 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GjrwV-0003OF-V9 for emacs-devel@gnu.org; Tue, 14 Nov 2006 01:38:48 -0500 Original-Received: from [209.226.175.54] (helo=tomts10-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GjrwT-0005Ol-H7; Tue, 14 Nov 2006 01:38:45 -0500 Original-Received: from alfajor.home ([74.12.204.152]) by tomts10-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20061114063844.HRJW13241.tomts10-srv.bellnexxia.net@alfajor.home>; Tue, 14 Nov 2006 01:38:44 -0500 Original-Received: by alfajor.home (Postfix, from userid 20848) id A481D1C1FF; Tue, 14 Nov 2006 01:38:38 -0500 (EST) Original-To: Miles Bader In-Reply-To: <874pt3vv10.fsf@catnip.gol.com> (Miles Bader's message of "Tue\, 14 Nov 2006 07\:31\:07 +0900") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.90 (gnu/linux) 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:62281 Archived-At: > 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? Or rename directory A to B and merge a branch which added a file A/toto.c, Stefan