Can't ignore file in TortoiseGit. Error text is:
How can I fix it?
Folder info and file exclude was missing. I created it manually and everything worked. Solution is based on hinneLinks's comment. Thanks.
Related
Here is my scenario:
I want to resolve a conflict in my repository and, in the same time, I also want to let the user to be able to commit other files without having to commit the resolved file. I tried the following:
git status: 1.txt(conflict) 2.txt(modify)
git resolve: 1.txt(modify) resolve the conflict
git commit 2.txt //Only commit 2.txt
git show log : 1.txt(modify) 2.txt(modify)
On the submission list, I only submitted 2.txt, but when viewing the log, 1.txt was submitted by default, why is this happening, and at the same time, the file status of 1.txt is still modify, how to parse this, I am a bit confused? Thanks in advance for your help!
I checked the source code of TortoiseGit and found that it restored the unchecked files after submission
You need to navigate to the file currently modified, in your case 1.txt(modify)
you will notice in this file Git has added something similar to <<<<<<head>>>>>> This will show you where the current origin is, and then your current change underneath it.
Please Make sure you have resolved this conflict by deleting the correct set of code in the outlined file. After you do this you can continue with your commit.
Hope this helps
Conflicts always need to be resolved before committing.
If you unselect a file then the changes are not part of the commit, i.e. the file stays in the unmerged version in the commit.
We're using svn for version control on our Mac. Its working cool. But the only problem is we're multiple devs developing together and everyone can see any file changes status inside their Xcode ( attributes next to the file ) in their Xcode except me. How to resolve this?
This is what I want (see "M" next to the file name),
Even Xcode Source Control Menu is showing no changes.
I'm not sure if there's anything to set here?
I have checkout the code again and again, but still the problem persist.
I'm not sure, why this "Working Copies" menu "iOS" is disabled? Its enabled on other machine.
Any help would be highly appreciated.
I also encountered this problem, the following is my solution, hope I can help you.
Start the terminal, enter the code in the folder.
Type the command - svn status.
The output will be similar to this
svn: E155036: Please see the 'svn upgrade' command
svn: E155036: The working copy at '/Users/chao/svn/project'
is too old (format 29) to work with client version '1.9.4 (r1740329)' (expects
format 31). You need to upgrade the working copy first.
Type the command - svn upgrade.
The problem is resolved,I wish you good luck.
SVN can define status of working copy files and directories comparing your local files with the current repository located on the remote SVN server.
I believe that checking "Refresh server status automatically" will do the job.
You can say this is true when your local files will have attributes aside (U, M etc)
Having no luck, you may run the command line tool, which is usually more verbose. More details here: https://stackoverflow.com/a/19922150/195812
I am working with svn server to upload my updated file to server. But at last when i upload latest copy to server at that time i get Obstructing warning in my below given Xcode project file. I dont know what to do for this please help me to get it out.
Following is my file which is giving me Obstructing warning.
UserInterfaceState.xuserstate.
dat0b55.00f
When i search this file in finder it give me location of xproject workspace.path as below:
MyProject.xcodeproj/project.xcworkspace/xcuserdata/myworkspace.xcuserdatad/UserInterfaceState.xcuserdatad.
I can't understand how to remove this warning. I can't remove project and upload fresh copy because it is on client server.
So, If it possible please help me to solve it manually without deleting project.
I have solved this by replacing all required files from my back up.You can get above file from .pbx extract your project file with show in package content and replace it.It's work for me fine.
I've been having a bit of a problem with Subversion on my Mac running Lion. Anytime I try to checkout any repository I always get this error:
svn: XML data was not well-formed
Any advice?
Thanks in advance!
P.S. I have close to none experience with subversion.
Yes i have faced a lot of problem due to this strange error. Seems like when svn has conflicting auth data in existing .ssh folder it gets this error.
Please delete (rename in case you want a backup) ~/.ssh and ~/.subversion directories. Deleting only .ssh should work.
Error message :
"svn: Can't open file '/Users/username/Projects/myproject/trunk/project/.svn/text-base/filetoupdate.h.svn-base': No such file or directory"
Question:
I have an issue I've replaced a file in a project (in Xcode) with a new file (For reference and if this makes a difference, the new file has the same name as the one I deleted previously).
Now when I try to commit my changes in Xcode I get the error message detailed above and am unable to commit the changes (i.e. adding the new file).
In the file system view (in Xcode on the left hand side of the screen) the file has an R next to it (indicating Replaced in the repository).
Does anyone know how to fix it so I can commit the files?
Thanks
There is a bug or limitation in Subversion when using case-insensitive filesystems:
https://superuser.com/questions/303348/cant-checkout-in-subversion
This bug normally shows up when checking out a repository that contains two files whose names differ only in case. Of course, these cannot exist at the same time in the same directory on a case-insensitive filesystem. SVN could give a much more helpful error message, but it can't really solve the problem.
Your issue is a bit different because I assume the file filetoupdate.h (with the old case) no longer exists in your filesystem. So it's not a case conflict in the working directory. But I guess that SVN is trying to create the file in .svn/text-base with the new case, while the old one still exists, and that is failing (for the same reason).
You could try deleting the file from Subversion first, keeping the local copy (untested). The new copy must be removed from SVN control for the commit to succeed:
svn rm --keep-local --force FileToUpdate.h
And the old copy must be removed as well, to allow us to add the new copy later:
svn rm --keep-local filetoupdate.h
Commit this change:
svn commit
Now hopefully you can add the new file to version control:
svn add FileToUpdate.h
If that doesn't work, you might need to blow away the whole checkout and start again with a fresh one.
Are you on a Mac or Windows? Those have case-insensitive filesystems which causes the above problem when
a file currently exists with the same name but with different cases.
To fix , checkout out the tree on a Linux machine, then "svn rm" one of the files.
Maybe your local version has permission issues. Check if your user have the permissions to write for the .svn directories.
good luck
It looks like something got confused somewhere. To fix, I simply copied the offending files, saved them under a new name. Removed the originals from the project and the added the copied (renamed) version of the file to the project.
It seems to be that SVN doesn't like it if you add and remove a file with the same name. I tried cleaning the SVN through terminal, but it had no affect on this issue. But changing the name did work for me.