From owner-freebsd-arm@FreeBSD.ORG  Sun Aug 31 18:29:11 2014
Return-Path: <owner-freebsd-arm@FreeBSD.ORG>
Delivered-To: freebsd-arm@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D12D03BF
 for <freebsd-arm@freebsd.org>; Sun, 31 Aug 2014 18:29:11 +0000 (UTC)
Received: from poczta.toomeek.waw.pl (unknown
 [IPv6:2001:67c:232c:1000::fd9b:4fb4])
 by mx1.freebsd.org (Postfix) with ESMTP id 88ADD18A7
 for <freebsd-arm@freebsd.org>; Sun, 31 Aug 2014 18:29:11 +0000 (UTC)
Received: from [192.168.137.1] (dmp75.neoplus.adsl.tpnet.pl [83.24.71.75])
 by poczta.toomeek.waw.pl (Postfix) with ESMTPSA id 59F4BC601AC
 for <freebsd-arm@freebsd.org>; Sun, 31 Aug 2014 14:29:06 -0400 (EDT)
Message-ID: <54036970.9040503@toomeek.waw.pl>
Date: Sun, 31 Aug 2014 20:29:04 +0200
From: TooMeeK Admin <maps@toomeek.waw.pl>
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64;
 rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: freebsd-arm@freebsd.org
Subject: Re: U-boot for Banana Pi
References: <53EE0F93.6060407@toomeek.waw.pl> <53EE23B1.2020403@toomeek.waw.pl>
 <CAGtf9xNTsQg-WKMu+RqNmF3W=vKm8ccvNdcL1VKm9gWwRohsTw@mail.gmail.com>
 <53EE402D.8000204@toomeek.waw.pl> <20140815214416.GJ60808@cicely7.cicely.de>
 <53EFCD6C.5000601@toomeek.waw.pl> <53EFD5D5.7010406@toomeek.waw.pl>
 <53F0E640.5030506@toomeek.waw.pl> <53F14BD7.1050007@fukaumi.org>
 <53F1A126.1020408@toomeek.waw.pl> <53F1D8FD.9010903@fukaumi.org>
 <53F27EB9.3090805@toomeek.waw.pl>
 <CAGtf9xNw8EAakGLpYL+xi20QdOYZQMg=_A-QtriU5kqY2jLBUA@mail.gmail.com>
 <54031BC8.8020407@toomeek.waw.pl> <540348DD.3090406@toomeek.waw.pl>
 <20140831181954.499135cfbffb3266d7ce69ab@schwarzes.net>
In-Reply-To: <20140831181954.499135cfbffb3266d7ce69ab@schwarzes.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.3.9
 (poczta.toomeek.waw.pl [0.0.0.0]); Sun, 31 Aug 2014 14:29:07 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.98.4 at a8d2ba546e
X-Virus-Status: Clean
X-BeenThere: freebsd-arm@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "Porting FreeBSD to ARM processors." <freebsd-arm.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-arm>,
 <mailto:freebsd-arm-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arm/>
List-Post: <mailto:freebsd-arm@freebsd.org>
List-Help: <mailto:freebsd-arm-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arm>,
 <mailto:freebsd-arm-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Aug 2014 18:29:11 -0000

Thanks,

I didn't used this tool before. How to resolve conflicts?
....
Tree conflict on '/usr/src/COPYRIGHT'
    > local file unversioned, incoming file add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: h

   (r)  - accept current working copy state
   (p)  - resolve the conflict later  [postpone]
   (q)  - postpone all remaining conflicts
   (h)  - show this help (also '?')

Should I type "r" here?
If yes, then I still have obsolete versions, example:
/usr/src/sys/boot/fdt/dts/cubieboard2.dts
doesn't match:
http://svn.freebsd.org/base/head/sys/boot/fdt/dts/arm/cubieboard2.dts

root@freebsd:/sys/boot/fdt/dts # cd /usr/src
root@freebsd:/usr/src # svnlite checkout 
http://svn.freebsd.org/base/head /usr/src
Checked out revision 270885.
root@freebsd:/usr/src # svnlite update
Updating '.':
At revision 270885.

Best regards,
TooMeeK


W dniu 2014-08-31 18:20, Andreas Schwarz pisze:
> On Sun, 31 Aug 2014 18:10:05 +0200
>
> The simplest way to get head is to use svn (or the included svnlite).
>
> initial :
>
>   svnlite checkout http://svn.freebsd.org/base/head /usr/src
>
>   (change protocol and path if needed)
>
> update :
>
>   cd /usr/src
>   svnlite update
>
>
>