Re: tree conflict: new folder with old name

2010-05-27 Thread Giampiero Salvi
On 10-05-27 01:25 PM, Johan Corveleyn wrote: On Thu, May 27, 2010 at 12:55 PM, Ulrich Eckhardt wrote: The repository is stable, I think you mean the working copy. I guess that you have local, unversioned files in your local "folder_name". Those are not moved with the versioned files, so after

Re: tree conflict: new folder with old name

2010-05-27 Thread Johan Corveleyn
On Thu, May 27, 2010 at 12:55 PM, Ulrich Eckhardt wrote: > On Thursday 27 May 2010, Giampiero Salvi wrote: >> I know this is my fault, I'm just checking if there is a way to fix this. >> >> I renamed a folder and then created a new folder with the old name of >> the first one: >> >> svn mv folder_

Re: tree conflict: new folder with old name

2010-05-27 Thread Ulrich Eckhardt
On Thursday 27 May 2010, Giampiero Salvi wrote: > I know this is my fault, I'm just checking if there is a way to fix this. > > I renamed a folder and then created a new folder with the old name of > the first one: > > svn mv folder_name folder_name2008 > svn ci -m "renamed folder_name" > mkdir fol