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

Directory conflict when adding and switching a file

From: Blair Zajac <blair_at_orcaware.com>
Date: Tue, 16 Sep 2008 07:52:12 -0700

Hi Julian,

When trying to merge r33082 from trunk into the file-conflicts branch,
I ran into a problem with a directory conflict on the directory that
will contain a file external. File externals are set up in a wc by
adding a new empty file and then switching it to the external URL.

Here's how to replicate it using trunk_at_33094

$ svn co http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts
$ cd tree-conflicts/
$ touch foobar
$ svn add foobar
$ svn status
A foobar
$ svn switch http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts/resolution.txt
E foobar
C .
$ svn status
C .
     S foobar


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-16 16:52:35 CEST

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

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