From owner-freebsd-doc@FreeBSD.ORG Sun Jul 7 22:24:50 2013 Return-Path: Delivered-To: doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 67084F0A; Sun, 7 Jul 2013 22:24:50 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-ee0-x234.google.com (mail-ee0-x234.google.com [IPv6:2a00:1450:4013:c00::234]) by mx1.freebsd.org (Postfix) with ESMTP id C8553195E; Sun, 7 Jul 2013 22:24:49 +0000 (UTC) Received: by mail-ee0-f52.google.com with SMTP id c50so2491696eek.11 for ; Sun, 07 Jul 2013 15:24:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=Dve7rhM2dwLT25Bdnp2cdiIkh1ywdJqF+YI7i7hsG7I=; b=Nsz6uH/6kvLUZmjIHVJHYUEazYMTFXGyZGbhxC7LOc0//I9GVr88Wn+KsCdHn0fbkN waS5hWrV3/6fk7D9pLHQjIixWLdWkEkmwrWydTB2WOfTASbfUdxXw6WqW8T1+yNMUq5X cmWX9H2IZe+8ChBzemRIIMOBm2V1Xa95gpI0V85kRP6rzqirrCklXyxH6pxn6kxrryKi qOW0RdGkT5LHfY7QGF6JwK+HKJaJJOpXTqzMKS+PgpfQ/0B600rMOb0QlyGQj4MQXCev 6vlwurL5zk6IDY35r76o2nBvp3NuJ6zHV7EqaQ4BXdfVPrdJCuUM5RDm0tJ88FIYOWy5 g00A== X-Received: by 10.14.47.73 with SMTP id s49mr22124828eeb.71.1373235888939; Sun, 07 Jul 2013 15:24:48 -0700 (PDT) Received: from ?IPv6:2001:980:d7ed:1:7d41:3373:c2c3:78ab? ([2001:980:d7ed:1:7d41:3373:c2c3:78ab]) by mx.google.com with ESMTPSA id a4sm37036169eez.0.2013.07.07.15.24.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 07 Jul 2013 15:24:48 -0700 (PDT) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <51D9EAAE.6070509@freebsd.org> Date: Mon, 08 Jul 2013 00:24:46 +0200 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130701 Thunderbird/17.0.7 MIME-Version: 1.0 To: Gabor Kovesdan Subject: Re: [CFT] merging projects/entities References: <51D7F70B.8000206@freebsd.org> <51D83F92.7030808@FreeBSD.org> <51D98705.4070403@freebsd.org> <51D988DE.2050600@FreeBSD.org> <51D98E6D.2060306@freebsd.org> <51D99892.3000905@FreeBSD.org> <51D99D07.1070808@freebsd.org> <51D9B744.8040004@FreeBSD.org> <51D9BAD0.6000904@freebsd.org> <51D9CC30.7090604@FreeBSD.org> In-Reply-To: <51D9CC30.7090604@FreeBSD.org> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Cc: FBSD Doc project X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jul 2013 22:24:50 -0000 On 07-07-2013 22:14, Gabor Kovesdan wrote: > Em 07-07-2013 21:00, René Ladan escreveu: >> Heh, missed that myself too. So now only tidying up or synchronizing >> whitespace for share/xml/catalog.xml remains to be done? > Personally, I think it would be better to commit that whitespace fix > separately. Even if you committed it separately in the branch, it > would go to head intermixed with real changes, which makes it hard to > read the backlog. This is a disadvantage in general and it is quite a > big hassle for translators. I think you did it fine since you didn't > have to foresee these consequences but maybe we should document it as > a best practice to avoid whitespace changes in branches. > I didn't think it through this far, but you're right. I think it's best to write this down somewhere in the FDP? For now this is fixed in head (r42191, whitespace-only forward commit) and in projects/entities (r42192, fix some inadvertent changes). The only changes left are those from r40196, which are intended (modulo inline whitespace :-( ). René