Comments on: svn: Entry has unexpectedly changed special status http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/ About me and what I do :) Wed, 25 Aug 2010 12:01:20 +0000 hourly 1 http://wordpress.org/?v=3.0.1 By: Ian http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-422 Ian Mon, 14 Jun 2010 12:29:28 +0000 http://antoniolorusso.com/?p=127#comment-422 In an instance where you don't want to remove the file and have it re-added you can simply remove the special property from the file by running: svn pd svn:special In an instance where you don’t want to remove the file and have it re-added you can simply remove the special property from the file by running:

svn pd svn:special

]]> By: antonio lorusso http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-418 antonio lorusso Tue, 18 May 2010 10:51:34 +0000 http://antoniolorusso.com/?p=127#comment-418 Hi Sarahg, to be honest, I've never been in this kind of situation with git yet but I assume the it should be more clever and just replace the file automatically. If you try and have issues, let me know. Hi Sarahg,
to be honest, I’ve never been in this kind of situation with git yet but I assume the it should be more clever and just replace the file automatically. If you try and have issues, let me know.

]]> By: sarahg http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-417 sarahg Tue, 18 May 2010 02:12:51 +0000 http://antoniolorusso.com/?p=127#comment-417 Its a tough situation for svn to resolve cleanly, although more upfront rules like warning that you made the change and saying what to do about it would be good. antonio, how does git handle changes to/from symlinks when you update a working copy? Does it have an elegant solution? Its a tough situation for svn to resolve cleanly, although more upfront rules like warning that you made the change and saying what to do about it would be good.

antonio, how does git handle changes to/from symlinks when you update a working copy? Does it have an elegant solution?

]]> By: antonio lorusso http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-404 antonio lorusso Tue, 16 Feb 2010 23:03:03 +0000 http://antoniolorusso.com/?p=127#comment-404 :) I know, svn is bad... :) I know, svn is bad…

]]> By: john http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-403 john Tue, 16 Feb 2010 21:30:20 +0000 http://antoniolorusso.com/?p=127#comment-403 $ mkdir -p /tmp/svn_test/rep $ cd /tmp/svn_test $ svnadmin create rep $ svn co file:///tmp/svn_test/rep co Checked out revision 0. $ cd co $ echo test file a >a $ ln -s a l $ svn add * A a A l $ svn ci -m'add file and link' Adding a Adding l Transmitting file data .. Committed revision 1. $ rm l $ cp a l $ svn ci -m'file replaces link' svn: Commit failed (details follow): svn: Entry '/tmp/svn_test/co/l' has unexpectedly changed special status $ svn rm --keep-local l D l $ svn ci -m'get rid of the link!' svn: Commit failed (details follow): svn: Entry '/tmp/svn_test/co/l' has unexpectedly changed special status $ svn add l A l $ svn ci -m'file replaces link!' svn: Commit failed (details follow): svn: Entry '/tmp/svn_test/co/l' has unexpectedly changed special status $ svn rm l svn: 'l' is in the way of the resource actually under version control $ mv l i_have_to_move_this_away_manually_because_svn_sucks $ svn ci -m'get rid of the link - finally!' Deleting l Committed revision 2. $ mv i_have_to_move_this_away_manually_because_svn_sucks l $ svn add l A l $ svn ci -m'file replaces link, yay :P' Adding l Transmitting file data . Committed revision 3. Very handy for maintaining vendor branches ;) But I guess there's already a bug filed for that long long ago .. $ mkdir -p /tmp/svn_test/rep
$ cd /tmp/svn_test
$ svnadmin create rep
$ svn co file:///tmp/svn_test/rep co
Checked out revision 0.
$ cd co
$ echo test file a >a
$ ln -s a l
$ svn add *
A a
A l
$ svn ci -m’add file and link’
Adding a
Adding l
Transmitting file data ..
Committed revision 1.
$ rm l
$ cp a l
$ svn ci -m’file replaces link’
svn: Commit failed (details follow):
svn: Entry ‘/tmp/svn_test/co/l’ has unexpectedly changed special status
$ svn rm –keep-local l
D l
$ svn ci -m’get rid of the link!’
svn: Commit failed (details follow):
svn: Entry ‘/tmp/svn_test/co/l’ has unexpectedly changed special status
$ svn add l
A l
$ svn ci -m’file replaces link!’
svn: Commit failed (details follow):
svn: Entry ‘/tmp/svn_test/co/l’ has unexpectedly changed special status
$ svn rm l
svn: ‘l’ is in the way of the resource actually under version control
$ mv l i_have_to_move_this_away_manually_because_svn_sucks
$ svn ci -m’get rid of the link – finally!’
Deleting l
Committed revision 2.
$ mv i_have_to_move_this_away_manually_because_svn_sucks l
$ svn add l
A l
$ svn ci -m’file replaces link, yay :P ’
Adding l
Transmitting file data .
Committed revision 3.

Very handy for maintaining vendor branches ;)
But I guess there’s already a bug filed for that long long ago ..

]]> By: antonio lorusso http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-368 antonio lorusso Tue, 10 Nov 2009 09:40:30 +0000 http://antoniolorusso.com/?p=127#comment-368 Hi Ken, after more than one year, I'm not sure, but I think that svn wasn't giving such a clear message in some of the previous versions. Hi Ken,
after more than one year, I’m not sure, but I think that svn wasn’t giving such a clear message in some of the previous versions.

]]> By: Ken http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-367 Ken Tue, 10 Nov 2009 01:52:04 +0000 http://antoniolorusso.com/?p=127#comment-367 Um, how about reading what it's telling you to do? The error says 'the deletion must be committed and the parent updated before adding.' Is this not perfectly clear? Well, I guess not. So do this: svn remove neorunner svn commit -m 'Removing neorunner file.' svn update ln -s whatever neorunner svn add neorunner svn commit -m 'Adding new neorunner symlink.' Was that so hard? It does suck if you don't read instructions. Um, how about reading what it’s telling you to do? The error says ‘the deletion must be committed and the parent updated before adding.’ Is this not perfectly clear? Well, I guess not. So do this:

svn remove neorunner
svn commit -m ‘Removing neorunner file.’
svn update
ln -s whatever neorunner
svn add neorunner
svn commit -m ‘Adding new neorunner symlink.’

Was that so hard? It does suck if you don’t read instructions.

]]> By: antonio lorusso http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-44 antonio lorusso Thu, 16 Jul 2009 11:49:57 +0000 http://antoniolorusso.com/?p=127#comment-44 have you had a look at GIT ? ;) have you had a look at GIT ? ;)

]]> By: Ivan Ogai http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-43 Ivan Ogai Tue, 14 Jul 2009 11:55:49 +0000 http://antoniolorusso.com/?p=127#comment-43 svn: Can't replace 'neo-freerunner' with a node of a differing type; the deletion must be committed and the parent updated before adding 'neo-freerunner' Time to start moving projects to mercurial. SVN sucks. svn: Can’t replace ‘neo-freerunner’ with a node of a differing type; the deletion must be committed and the parent updated before adding ‘neo-freerunner’

Time to start moving projects to mercurial. SVN sucks.

]]> By: en http://antoniolorusso.com/2008/09/29/svn-entry-has-unexpectedly-changed-special-status/comment-page-1/#comment-41 en Tue, 07 Jul 2009 12:11:25 +0000 http://antoniolorusso.com/?p=127#comment-41 Thank you. Thank you.

]]>