Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Sep 2012 17:18:29 +0000 (UTC)
From:      jb <jb1234abcd@gmail.com>
To:        freebsd-questions@freebsd.org
Subject:   Re: new to subversion
Message-ID:  <loom.20120922T190146-564@post.gmane.org>
References:  <20573.44683.809001.720104@jerusalem.litteratus.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?loom.20120922T190146-564>