From owner-freebsd-hackers@FreeBSD.ORG  Tue Sep 20 22:31:50 2011
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9603E106566C
	for <hackers@freebsd.org>; Tue, 20 Sep 2011 22:31:50 +0000 (UTC)
	(envelope-from lev@FreeBSD.org)
Received: from onlyone.friendlyhosting.spb.ru (onlyone.friendlyhosting.spb.ru
	[IPv6:2a01:4f8:131:60a2::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C21D8FC13
	for <hackers@freebsd.org>; Tue, 20 Sep 2011 22:31:50 +0000 (UTC)
Received: from lion.home.serebryakov.spb.ru (unknown
	[IPv6:2001:470:923f:1:f803:edca:622b:8392])
	(Authenticated sender: lev@serebryakov.spb.ru)
	by onlyone.friendlyhosting.spb.ru (Postfix) with ESMTPA id 9175C4AC1C; 
	Wed, 21 Sep 2011 02:31:49 +0400 (MSD)
Date: Wed, 21 Sep 2011 02:31:47 +0400
From: Lev Serebryakov <lev@FreeBSD.org>
Organization: FreeBSD
X-Priority: 3 (Normal)
Message-ID: <1016063405.20110921023147@serebryakov.spb.ru>
To: David Chisnall <theraven@theravensnest.org>
In-Reply-To: <3A86EAEA-1861-43A6-95DC-FC700BE0E507@theravensnest.org>
References: <DCAF3E3D-B2E1-40EF-B654-23625A17C3F1@theravensnest.org>
	<20110919172214.GJ33993@hoeg.nl>
	<3A86EAEA-1861-43A6-95DC-FC700BE0E507@theravensnest.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=windows-1251
Content-Transfer-Encoding: quoted-printable
Cc: hackers@freebsd.org
Subject: Re: xlocale patch
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: lev@FreeBSD.org
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Sep 2011 22:31:50 -0000

Hello, David.
You wrote 20 =F1=E5=ED=F2=FF=E1=F0=FF 2011 =E3., 23:17:28:

> Ooops, I forgot I uninstalled the subversion-freebsd package and
> installed subversion to work on libc++ (it would be really nice if
> these two could coexist, by the way...).
  How does subversion-freebsd prevent you from working on libc++? Is
it uses $FreeBSD$ string? :)
  FreeBSD changes are:

  (1) Support for additional keywords to make $FreeBSD works.
  (2) Different style of merge conflict markers.
  (3) Commit message template.

 (3) could be annoying, but not show-stopper for sure.

 Next version of subversion will not have -freebsd variant, but will
have three different options for mentioned hacks :)

--=20
// Black Lion AKA Lev Serebryakov <lev@FreeBSD.org>