From owner-freebsd-doc@FreeBSD.ORG Thu Oct 30 16:30:37 2014 Return-Path: Delivered-To: freebsd-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC88748E; Thu, 30 Oct 2014 16:30:37 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7BB9FFAF; Thu, 30 Oct 2014 16:30:37 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id C0F9DBDC24; Thu, 30 Oct 2014 17:30:35 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 9F879BDC1D; Thu, 30 Oct 2014 17:30:35 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id B8BD760E8; Thu, 30 Oct 2014 17:30:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 20DF7773F05E; Thu, 30 Oct 2014 17:30:34 +0100 (CET) Date: Thu, 30 Oct 2014 17:30:33 +0100 From: Mathieu Arnold To: Enrico Maria Crisostomo , freebsd-doc@FreeBSD.org Subject: Re: Suggestion about a correction in Porter' HandBook, Chapter 10 Message-ID: In-Reply-To: References: X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Cc: Matthew Seaman X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2014 16:30:37 -0000 +--On 30 octobre 2014 12:50:18 +0100 Enrico Maria Crisostomo wrote: | Hi all, | | This morning I was notified by Matthew Seaman about a problem in a port I | maintain and finally we discovered that `svn diff` does **not** output | information about files that have "history scheduled with commit": that | is, files which seem to be new files, but in reality are not. The | typical case is files "added" as a result of a `svn mv` operation. This | behaviour led to the problem that affected the port. | | The Porter's Handbook implicitly implies that `svn diff` is equivalent to | `diff -ruN` but in fact it is not: using `svn diff` may lead to the | aforementioned problem. svn 1.7 added the `--show-copies-as-adds` option | to the `svn diff` command which forces the expected behaviour. | Therefore, I suggest Chapter 10, Section 1, "Using Subversion to Make | Patches" to be amended in order to describe this behaviour. Unless mistaken, the PHB says that if you move files around, you *must* say so in the PR you open, so that the developper can replicate the commands before applying the patch. Because if you add --show-copies-as-adds, the diff will be in such a way that files will get created without its ancestry taken into account, which we *do not* want. The good thing about Subversion is that it has a way to know that foo has been copied to bar without having to fiddle around in the repository doing repo-copies like we used to do with CVS... If the PHB is not clear about that (or I just dreamt I read/wrote that bit) do tell me, I'll fix it :-) Regards, -- Mathieu Arnold