[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug? svn update --accept mine-full fails if an added file exists unversioned in the working copy

From: Danny Trebbien <dtrebbien_at_gmail.com>
Date: Sun, 20 Feb 2011 11:36:05 -0800

On Sun, Feb 20, 2011 at 10:11 AM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> For update, the '--force' switch means "If a local file obstructs an
> incoming add, then use that file (and flag the file as
> locally-'M'odified) instead of flagging a tree conflict".  Have you
> tried it?
> P.S.  In Subversion 1.7, you can spell that '--accept mf' too :-)
> (using the shorthands from the interactive conflict resolution prompt)

Oh, okay. I will try that next time because I got around this problem
by `svn add`ing each file and re-trying the update until it finally
Received on 2011-02-20 20:37:07 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.