Got this message when try to commit new folder to the SVN.
Commit failed (details follow):
Server sent unexpected return value (405 Method Not Allowed) in response to MKCOL request for
How can i overcome this error. Thank you
This error usually happens when the directory already exists in SVN repository.
Try the following:
Save your folder outside your SVN working copy
Undo Add
Do SVN Update on parent's folder; The folder should me added
Overwrite this newly added folder with the copy made outside SVN
Related
I've just altered a file and successfully committed it and pushed it and everything is fine from that point of view but when I go back into the master branch it seems to have created an extra yaml file...exactly the same as the one I've just pushed but this time it has my machine name appended to the end of it...
It started off looking like this .gitlab-ci-yml....but it's now created an extra one called .gitlab-ci-mikeslaptop.yaml in the same folder ...and posh git says [master = +1 ~0 -0 !] and git says untracked files (use "git add ,file>..." to include in what will be committed) .gitlab-ci-mikeslaptop.yaml
Has anyone ever seen this behaviour before..I'm goggling but finding nothing.
any help gratefully received
Our Laravel project is using symlinks. Recently when I tried to pull from my colleague's work, I get this message:
CONFLICT (modify/delete): resources/lang/en/validation.php deleted in HEAD and modified in a262067feb430a072c1d3abf2ec500150212ff0f. Version a262067feb430a072c1d3abf2ec500150212ff0f of resources/lang/en/validation.php left in tree.
error: failed to symlink 'resources/lang/en/validation.php': File name too long
Upon trying to git rm the file, I am told it doesn't exist and is deleted in HEAD. Then when I pull I get the same message as above. Upon trying to touch the file and git add the file, and commit and then pull (in order to push my changes to the same branch), I get a similar error message:
CONFLICT (content): Merge conflict in resources/lang/en/validation.php
CONFLICT (modify/delete): resources/lang/en/auth.php deleted in HEAD and modified in a262067feb430a072c1d3abf2ec500150212ff0f. Version a262067feb430a072c1d3abf2ec500150212ff0f of resources/lang/en/auth.php left in tree.
error: failed to symlink 'resources/lang/en/auth.php': File name too long
I have tried to skip-worktree the file, assume-unchanged the file and to change the git config setting via git config --local core.longpaths true to allow long-paths. None have worked. I think it has to do with the symlink, but I haven't run the script yet and so I don't know how this is a barrier to pulling for git.
When I do try to run the symlink, I get this error message:
error: unable to create symlink resources/lang/en/auth.php: File name too long
error: unable to create symlink resources/lang/en/validation.php: File name too long
Long story short, I cannot git pull, and therefore cannot git push. What's the solution? I don't want to git push force it.
Running git pull is just running two Git commands:
First, git pull runs git fetch. This obtains any new commits needed for the second command.
Second, git pull runs ... well, this can be complicated. You are having it run the default, though: git merge.
Usually when git pull fails, one of these two commands that it runs is the one that actually failed. The second command fails more often unless you have a particularly flaky Internet connection. In your case, it's the git merge that failed.
The word failed is usually too strong, really. Most merges do not actually fail. They just stop in the middle of the operation due to a conflict (or two conflicts, in your particular case). But your merge is a little special. It really does have an internal failure, which repeats several times:
error: unable to create symlink resources/lang/en/auth.php: File name too long
error: unable to create symlink resources/lang/en/validation.php: File name too long
This is happening because your OS is placing a hard limit on the length of the target of a symbolic link. As you found:
It seems it was trying to make a symlink out of the content inside the file instead of the file name ...
Git's internal limits are much bigger than your OS's.
A symbolic link is just data, at one level, and that's how Git tends to store it (as a blob object, but one with mode 120000 rather than the normal file mode of 100644 or 100755). At another level, the data will be interpreted as a file name, and that file name tends to have a length limit, such as 1024 or 4096 bytes.
What would git show do?
git show will spill out the contents of the symlink, when pointed to a symbolic-link object.
$ git hash-object -w -t blob /usr/share/misc/termcap
d305cd8e161ecc8a78b0485d1926b9600efc6cb7
$ git update-index --add --cacheinfo 120000,d305cd8e161ecc8a78b0485d1926b9600efc6cb7,crazy
$ git commit -m "add crazy-long symlink"
[master dbb6e35] add crazy-long symlink
1 file changed, 4725 insertions(+)
create mode 120000 crazy
The normal tools will no longer work with this repository (which I made just to hold this crazy-long symlink):
$ git log | sed 's/#/ /'
commit dbb6e35967041fa4b03812866999ea0acd640dce
Author: Chris Torek <chris.torek gmail.com>
Date: Sun Nov 15 19:52:05 2020 -0800
add crazy-long symlink
commit c6e238c122dcd41410e7fdcfaa47ac112e935a35
Author: Chris Torek <chris.torek gmail.com>
Date: Sun Nov 15 19:51:58 2020 -0800
initial commit
$ git checkout HEAD^
This works fine, but trying to check out the second commit fails:
$ git checkout master
error: unable to create symlink crazy: File name too long
D crazy
Previous HEAD position was c6e238c initial commit
Switched to branch 'master'
What happens at this point is that Git simply leaves the symbolic link out of the working tree entirely. That's why it is in state D. You can still do work with the repository, but you cannot use the regular tools in the regular way.
With your merge, what you can do is delete the bad symbolic links entirely (safely), create correct (good) ones, and add them.
I have a post-receive hook in my server.
I also have a remote repo(origin) (branch:stage) where another developer pushes to.
I pull the commits and push them to production from my local computer.
I recently created a new branch(feature) from the latest head of the existing branch(stage), added some code and pushed the feature branch to remote repo. I merged the new features from feature branch to stage branch.
Then I pulled from the remote repo to local.
Now, I pushed the stage branch to production.
My post-receive file consists:
git --work-tree=/path/to/project --git-dir=/path/to/project.git checkout -
f stage
My head in the remote repo after merge is currently at ae228b9.
And, at the remote production hook's latest logs also points to ae228b9.
The problem is that the code from the merge are not seen in the production server.
Do I have to do something else to get the merged code to production?
After I pulled from origin and pushed to production, I tried changing the new files locally, committed them and push to the server. But, the changes are not reflected in the server.
Edit:
Also, I uninstalled apache php mysql and installed them again. Before the unistallation/installation, the home page was showing in server but the routes were not working(404 error) but the git hook was working. After the unistallation/installation, the git hook stopped working
Update:
I created a new hook with the same code as above. Now during the push I get:
remote: error: unable to unlink old '.gitignore' (Permission denied)
remote: error: unable to unlink old '.htaccess' (Permission denied)
remote: fatal: cannot create directory at '.idea': Permission denied
I tried the following code inside my project folder and project.git(hook) folder:
sudo chmod -R ug+w .;
unable to link
after which the push is a success but the changes are not reflecting.
I solved this by deleting the contents of the project folder and pushing again with some new changes.
I faced the same issue(Azure deployment)
There are two ways to ways to handle this -
Increase timeout setting (but deployment may stuck some times)
Push new changes (redeployment)
I prefer 2nd option.
I have a problem in git. I don't know why it says "nothing to commit (working directory clean)."
My development env: CentOS 6.4
My process is below:
mkdir develop
cd develop
git init(set user.name, user.email)
git remote add origin "repository_name"
git clone "repository_name"
Add "Test" folder
(amon2-setup.pl --flavor=Basic Test)
git status -> at this point, i can see "Untracked files ~~ Test/"
cd "Test" folder
git status -> at this point, nothing to commit (working directory clean)
Why does it say this? And if i pushed "Test", my github pushed data has been "subproject," so, i can't see Test folder's contents. Why is that?
Linux(bad)
http://www.fastpic.jp/viewer.php?file=6541584337.png
add amon files from Linux(bad i can't open files)
http://www.fastpic.jp/viewer.php?file=4456741517.png
Windows(ok)
http://www.fastpic.jp/images.php?file=8061488422.png
add amon files from Windows(ok)
http://www.fastpic.jp/viewer.php?file=8164112210.png
The gray folder for Test means:
Test is added as a submodule, which is why git status in the parent repo reports that "Test" must be added (it is a special entry in the index of the parent repo, which record that submodule)
Once in Test (which is a nested git repo), since that repo has no file, the git status reports a clear index.
Note also that Windows isn't case sensitive, so 'Test' wouldn't register properly, if there is already a 'test' (lowercase)
We have Four SVN users who work on a common project. The network environment is windows active directory based domain.Three users don't have any issues but fourth user faces issue while committing in SVN tortoise which is below:
Commit commit
Adding 'e:\projects\project1\tran.php'
Error Commit succeeded,but no other errors follow:
Error Error bumping revisions post-commit(details follow):
Error Can't set file
Error 'e:\projects\project1\tran.php'
Error read-write:Access is denied.
Error bumping revisions post-commit
Means: this user have client-side post-commit hook in TortoiseSVN, which doesn't work for some reason. Fix error or remove script