From owner-freebsd-questions@FreeBSD.ORG  Sat Sep 22 17:18:49 2012
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0964F1065673
	for <freebsd-questions@freebsd.org>;
	Sat, 22 Sep 2012 17:18:49 +0000 (UTC)
	(envelope-from freebsd-questions@m.gmane.org)
Received: from plane.gmane.org (plane.gmane.org [80.91.229.3])
	by mx1.freebsd.org (Postfix) with ESMTP id B7DEC8FC08
	for <freebsd-questions@freebsd.org>;
	Sat, 22 Sep 2012 17:18:48 +0000 (UTC)
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <freebsd-questions@m.gmane.org>) id 1TFTLo-0003aq-5b
	for freebsd-questions@freebsd.org; Sat, 22 Sep 2012 19:18:44 +0200
Received: from 79-139-19-75.prenet.pl ([79.139.19.75])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <freebsd-questions@freebsd.org>; Sat, 22 Sep 2012 19:18:44 +0200
Received: from jb1234abcd by 79-139-19-75.prenet.pl with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <freebsd-questions@freebsd.org>; Sat, 22 Sep 2012 19:18:44 +0200
X-Injected-Via-Gmane: http://gmane.org/
To: freebsd-questions@freebsd.org
From: jb <jb1234abcd@gmail.com>
Date: Sat, 22 Sep 2012 17:18:29 +0000 (UTC)
Lines: 25
Message-ID: <loom.20120922T190146-564@post.gmane.org>
References: <20573.44683.809001.720104@jerusalem.litteratus.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Complaints-To: usenet@ger.gmane.org
X-Gmane-NNTP-Posting-Host: sea.gmane.org
User-Agent: Loom/3.14 (http://gmane.org/)
X-Loom-IP: 79.139.19.75 (Mozilla/5.0 (X11; FreeBSD i386;
	rv:15.0) Gecko/20100101 Firefox/15.0.1)
Subject: Re: new to subversion
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Sep 2012 17:18:49 -0000

Robert Huff <roberthuff <at> rcn.com> writes:

> 
> 
> 	One quick question:
> 
> 	I've converted from csup to subversion for ports and docs.
> Ports works fine, but for docs, I get messages like:
> 
> Skipped 'mn_MN.UTF-8' -- Node remains in conflict
> 
> 	Deleting the tree and pulling a fresh chackout has not helped.
> 	Any suggestions?

Change to your top-most working copy dir (the one you obtained with checkout):
$ cd working-copy-dir
$ svn status
If you have done no local edits yet or do not care of loosing them (save it
otherwise), then do the following:
$ svn update --accept theirs-full
$ svn status

Did it help ?
jb