himezo / svnx

Automatically exported from code.google.com/p/svnx
0 stars 0 forks source link

No able to delete MappingModel.xcmappingmodel in working copy window #181

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
What steps will reproduce the problem?
1. Add Mapping file in xcode project & commit it.
2. Now delete the same file & see the working copy window for committing 
changes.

What is the expected output? What do you see instead?
Expected : It should show deleted mapping file in red
Present : It is showing the file status as ~ & revision as -1

What version of the product are you using? On what operating system?
SvnX Version 1.3.3
Mac OS Version 10.7.4

Please provide any additional information below.

Original issue reported on code.google.com by anand.wa...@gmail.com on 8 Aug 2012 at 8:03

GoogleCodeExporter commented 8 years ago
Firstly, it is essential that you use Subversion/svnX to ‘Remove’ versioned 
files & directories
and NOT the Finder.  It is not clear whether you did this.

I believe that MappingModel.xcmappingmodel is, in fact, a directory.
Subversion does not actually delete directories until you commit the change to 
the repository.
[Because directories contain a hidden .svn sub directory that contains 
Subversion meta info.]

However, if status is ‘~’ then the the tool-tip suggests that “Item is 
versioned as one kind of
object (file, directory, link), but has been replaced by different kind of 
object.”.
[You will also see this if you delete a versioned folder with the Finder & then 
replace it with a new folder.]

I don’t know exactly what you did, but I believe that svnX is behaving 
correctly.

Original comment by chris...@gmail.com on 8 Aug 2012 at 4:22

GoogleCodeExporter commented 8 years ago
       MappingModel.xcmappingmodel is a of directory type which is already committed in svn repository(This has .svn & an xml file in it). Today morning I checked out a fresh copy & deleted it from Xcode (not Finder) & saw in working copy window to remove  that file(directory) it looked as shown in attachment. After this I am not able to commit. Again to revert back I had to select the first two line from svnx working copy window & click on revert button(which removed the first one only) then to update (which removed second one as well)

     But I have noticed that now the status is "D" instead of "~". If I follow the same steps for any other file type it is working fine & checked other svn client for the same which is working fine.

Thanks
Anand

Original comment by anand.wa...@gmail.com on 10 Aug 2012 at 4:22

Attachments:

GoogleCodeExporter commented 8 years ago
Deleting via Xcode may (or may not) be the same as deleting via the Finder.
It depends on which version of Xcode, whether Xcode’s SCM is active, whether 
you delete refs or move to trash.

Your screen shot looks wrong.  There is no entry for the xml file you say was 
in MappingModel.xcmappingmodel.
[This may indicated that Xcode has deleted MappingModel.xcmappingmodel 
incorrectly.]

As I stated previously, use svnX to delete MappingModel.xcmappingmodel.  Then 
you should remove it in Xcode.

You state that you are not able to commit.  Do you get an error message?  What 
is it?

I still don’t believe that this is an svnX issue.

Original comment by chris...@gmail.com on 10 Aug 2012 at 4:51

GoogleCodeExporter commented 8 years ago
I have Xcode 4.4 & hope this is due to this it is happening. I still have to 
confirm it by upgrading Xcode to 4.4.1(or with Xcode 4.2 with snow leopard). 
The operation I did was to remove from Xcode with move to trash & I don't know 
how to do that with svnX working copy as it will not show until we make changes 
to it. Also I don't want to delete it from svnX in first place because Xcode 
update project file also when we delete it which we have to do it manually if 
we do from svnX. Anyways seems like not a major issue. I will be back again I 
find the same error with other Xcode version. Thanks for quick replies.

Original comment by anand.wa...@gmail.com on 13 Aug 2012 at 1:54

GoogleCodeExporter commented 8 years ago
Asking Xcode to “Move to Trash” when deleting is the same as dragging to 
Trash in the Finder.
DON’T DO IT to files/folders under Subversion control.
Simply tell Xcode to “Delete References”.  This will update the .xcodeproj 
while leaving the items on disc.
Then, if you want, you can use svnX to remove/delete the files/folders.

Xcode & svnX are doing the right thing & behaving correctly/as requested.

Original comment by chris...@gmail.com on 13 Aug 2012 at 3:40

GoogleCodeExporter commented 8 years ago

Original comment by chris...@gmail.com on 4 Sep 2012 at 5:36