Date: Mon, 08 Jul 2013 22:54:27 +0200 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org> To: FBSD Doc project <doc@FreeBSD.org> Subject: [CFT] merging projects/entities (new diff) Message-ID: <51DB2703.90605@freebsd.org>
next in thread | raw e-mail | index | archive | help
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é
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51DB2703.90605>