Re: moron at the helm - svn add mistake

Craig White wrote:
> When I originally set things up, I told it to svn:ignore
> 'environment.rb' config since I was doing different things with the file
> at various locations.
>
> I since remedied that and from one of my commits from home, I 'added'
> the file and it uploaded as part of the commit.
>
> Then like a fool, I added it at my 'production' server not recognizing
> the issue and I can't commit my changes saying that the file already
> exists. So on the 'production' server, I moved the file but the 'add'
> label is still there so even an 'svn update' fails saying that object is
> already scheduled for addition. Thus I can neither commit my changes nor
> update from the repository and I know I don't want to svn delete.
>
> How do I reconcile mistake of doing 'svn add' the same file from two
> checkouts?
If you s/reconcile/revert/ you'll have the answer.

Just do `svn revert environment.rb` and you should be fine.

Kalin.

-- 
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org