From owner-freebsd-doc@FreeBSD.ORG  Mon Jul  8 20:54:30 2013
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: doc@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D8349873
 for <doc@freebsd.org>; Mon,  8 Jul 2013 20:54:30 +0000 (UTC)
 (envelope-from r.c.ladan@gmail.com)
Received: from mail-wg0-x230.google.com (mail-wg0-x230.google.com
 [IPv6:2a00:1450:400c:c00::230])
 by mx1.freebsd.org (Postfix) with ESMTP id 71DCF18AB
 for <doc@freebsd.org>; Mon,  8 Jul 2013 20:54:30 +0000 (UTC)
Received: by mail-wg0-f48.google.com with SMTP id f11so4112204wgh.27
 for <doc@freebsd.org>; Mon, 08 Jul 2013 13:54:29 -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:subject
 :x-enigmail-version:content-type:content-transfer-encoding;
 bh=EMf9/MPaVspSsjrTl+CSHLUgwsKT1hWfOgRP39dRvxE=;
 b=jZnZYEBR+3Fz/xQMo7+z3lv/cXJXJNW7PQHycUihw6H+6GdiTzGspS4HtP29o5XCNQ
 6rer2PzKboei0yfgYxqcDNC0CteNARVTeHBfe0bp3GKB8jhzngdclLUQamMbvECVlpdh
 vlMgiZ0MBoY1CQDKcYhn7qq4B/r8xfwCEb/XZWbPBTNv/luKr0ent1Rhn+LEHKHq2DAH
 GSSwZMQ74iYLvnw9Cj1bi1mk74cqOwpNmK80qRgDLybZQHINget0eKDAIWtftLTXrpxo
 YHVxsATO/4bCmOGAu1VT6OIVV+cu8GFPyHJgUIVTVr529IM1mWMPI9aquhCNUI2z97Vo
 qMZQ==
X-Received: by 10.194.242.134 with SMTP id wq6mr12879325wjc.94.1373316869670; 
 Mon, 08 Jul 2013 13:54:29 -0700 (PDT)
Received: from ?IPv6:2001:980:d7ed:1:ed5f:372f:fef0:a690?
 ([2001:980:d7ed:1:ed5f:372f:fef0:a690])
 by mx.google.com with ESMTPSA id f8sm56110030wiv.0.2013.07.08.13.54.28
 for <doc@freebsd.org>
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Mon, 08 Jul 2013 13:54:28 -0700 (PDT)
Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= <r.c.ladan@gmail.com>
Message-ID: <51DB2703.90605@freebsd.org>
Date: Mon, 08 Jul 2013 22:54:27 +0200
From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130701 Thunderbird/17.0.7
MIME-Version: 1.0
To: FBSD Doc project <doc@FreeBSD.org>
Subject: [CFT] merging projects/entities (new diff)
X-Enigmail-Version: 1.5.1
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
 <mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 20:54:30 -0000

Hi,

I updated the diff [1] so that it contains the latest commits in the
entities branch and the latest merges from head.

I'll "svn merge" all subdirectories before the merge-to-head to keep the
mergeinfo in shape. The latter should be something like:

cd ${DOC}/head
(cd en_US.ISO889-1 && svn merge ^/projects/entities/en_US.ISO8859-1)
<repeat for all other directories>
<final check>
svn commit -m "some appropriate message"

if I'm not mistaken?

ftp://rene-ladan.nl/pub/freebsd/entities-r42196.diff
SIZE = 398479
SHA256 = a915dfc81e4335378854a7455069b4208d895cf6b6b36511cbd8ed43cb84fd96

René