I trying to update my local copy with TFS server project. Currently there is no workspace mapping (I have deleted the previous mapping) in my current copy. Now i have create a new workspace and mapped it with the same Local copy.
Now, whenever i am trying to run the TFS get command it says some local file is writable, therefore the checkout is getting failed.
ERROR:
/project/Test/css/v2/scss/utilities.scss: Local file /protextsoftwarescan1/project/Test/css/v2/scss/utilities.scss is writable
/project/Test/css/v2/utilities.css: Local file /protextsoftwarescan1/project/Test/css/v2/utilities.css is writable
You need to run tf resolve /auto:OverwriteLocal command to resolve the conflicts.
The OverwriteLocal option overwrites the file in your workspace with the server version. This is used to resolve conflicts that arise from a writable file in your workspace.
Please check Edward's and Grant's answer in this link for the details: TFS Conflict Type: Writable File - A writable file by same name exists locally
Related
I'm using VS Code with the mssql extension - both installed this week so up-to-date.
I can connect to our sql-server.
I then right-click the database name and select 'New Query' and do the following:
SELECT 1
I then save the file onto a network drive, re-run the script and all is still good.
I then save the file into a git versioned folder and this now happens:
It does not return a result - the query cannot be cancelled from within Code and I need to close the application. Moreover any .sql files I have saved in this git versioned directory are not usable from within Code.
Anyone any ideas what is happening and how to solve it?
Edit the git directory is cloned and synced from an Azure DevOps Repo
Unsure why the following works and there are likely other solutions.
I deleted my local Repo.
Then in Azure DevOps I cloned the repo using the "Clone to VS" option.
The SQL scripts now execute fine.
When I delete a file in the file system, TFS 2013 will correctly show it as still being in version control, but the file will not show as pending delete, and committing changes does not remove the file from the server. If I go to Source Code Explorer, the deleted file shows up as being on the server, but if I try to delete it, I get an error saying The item could not be found in your workspace, which is also correct, but I need to delete the file and I can't find any way to do it. I really do NOT want to have to download each file and manually delete it.
So, how can I get TFS to detect files that are no longer on the local file system and remove them from the server?
Note, my workspace is local, not server. Many sources say that TFS should detect local deletes in a local workspace, but this does not seem to be true, at least, it's not what I'm seeing.
Update: I know that my workspace is local because here's the TFS Workspaces window:
If the changes are not being detected then your workspace is currently configured as a Server Workspace and not a Local Workspace.
If you edit your workspace, click Advanced, and switch the workspace type to Local.
Note: You can check the configuration by looking for the hidden $tf folder in the root of your workspace...
Use /deletes with the tfs power tool: http://blogs.msdn.com/b/buckh/archive/2005/11/16/power-toy-tfpt-exe.aspx#Online
Hopefully there is some setting in git config for this...
Our project team chooses to store eclipse .project and .classpath settings in the git repository. Now, ignoring wether or not storing these files in the SCM is good or bad -- the problem is when the repository is cloned under windows any filename starting with a dot '.' is set as a system file, making it read-only which causes eclipse to spew errors when trying to update projects.
Could not write file: D:\git\SFP\framework\Auth_Server\.classpath.
D:\git\SFP_convert\framework\Auth_Server\.classpath (Access is denied)
So, how do I stop git from setting files starting with a dot '.' as system/read only?
Git shouldn't change those permission, and dotfiles aren't always considered as "system files" in read-only.
Case in point: a .gitignore present in most repo should be perfectly writable when the repo is cloned, even on Windows.
Git only stores two permissions (755=rwxr.xr.x, 644=rw.r..r..).
One way is to make sure to commit in a repo with git config core.filemode false.
But for a repo which already contains files with the incorrect permission, you need to make a new commit with those same files with the right 755 permission.
You can use a reverse patch or git-meta-cache.
The OP Jon reports:
We are currently using msysgit 1.6.5. upgrading to match the git version on the server (1.7.9) has fixed the problem.
I would recommend also to upgrade to the latest available (1.8.4 Sept. 2013)
This problem occurs when we copy the project from system to other system then some file are automatically hidden.You go in your project directory and in this project directory. some folder and file have a hidden attribute so un-check hidden attribute in all file and folder and now import project.
I was able to work with all my projects on Google Code just fine, but now I can't commit to any of them. I get the error:
Some of selected resources were not committed. svn: Commit failed
(details follow): svn: Repository UUID
'2b3ccc6c-acbf-642b-775e-b44874e3cfdd' doesn't match expected UUID
'2b06ef8f-344e-f67a-312d-ecb7346c3921'
(I am using Eclipse on Windows)
The same error occurs when I update.
You can fix this by correcting the UUID of the repository in the local SQLite3 subversion database. To do that, download sqlite3 from here:
http://www.sqlite.org/download.html
And put it somewhere on PATH so that the system knows about it. Then open the command prompt or your terminal (if you're on linux) in the directory that contains the repository .svn directory. Then open the subversion database file for editing like this:
sqlite3 .svn/wc.db
This will start a command a command line accepting SQL commands. Type in this command, replacing the UUID with the one that shows in your error message:
update REPOSITORY set uuid="2b3ccc6c-acbf-642b-775e-b44874e3cfdd" where id=1
Hit enter and CTRL+C to quit. Now you should be able to run your svn commit command again.
Your Working Copy is linked to Repository, which must have unique Identificator (UUID), which stored as a part of metadata in Working Copy and identity of stored UUID and contacted Repo's UUID is tested on operations, which can modify repository
For some reason, you try to communicate not to the same repository, from which your WC was created (same URL != same Repo)
Verify current UUIDs with svn info WC-PATH and svn info REPO-URL (REPO-URL for main repo and all "foreign", if externals used)
Repository UUID value must be the same
I just had this problem when I tried to commit two files at once that belonged to separate external repositories. I tried committing them separately and succeeded.
I have a remote repository for my project. I have cloned it to my local machine. I have to change two settings file to make this project run in my local machine. How can I make mercurial to ignore the changes in these two files in my local machine, so that the settings file in the online version will not get updated with the local settings file when I push the changes to the remote server.
Mercurial (and no one does) doesn't provide such facilities.
You need to exclude those files completely and store templates or file.config.sample files in repository so that each developer sets up theirs own personal config file manually or using some build script.
You can have other ignore files besides the .hgignore in the working directory. Add this to your hgrc:
[ui]
ignore = /path/to/repo/.hg/hgignore
Create the hgignore file inside the .hg folder and edit it with the files you want to ignore. It's like an extension of the .hgignore, but only for your local copy.