无法使用git-svn提交删除：您的文件或目录可能已过期 [英] Can't commit a delete using git-svn: Your file or directory is probably out of date

问题描述

我一直在查看此帖子，但仍然无法弄清楚如何解决我的问题。

我在本地使用git-svn来对付svn存储库。我通常执行以下操作：
$ b $ ol <

git svn rebase（从回购获得最新版本）。

git checkout local-dev

git合并master（将它合并到我的本地分支）

进行更改， / li>

git checkout master

git merge local-dev

git svn dcommit ）

通常工作正常，直到我试图将我的最新批次从合并的主数据提交回存储库：

$ git svn dcommit

承诺 http：// mysvnrepository ...
D PROJECT / Content / js / dp / jquery-1.3.2.js

在提交期间合并冲突：您的文件或目录'PROJECT / Content / js / dp'可能是
过期：资源已过期;尝试在C：\程序文件\Git / libexec / git-core / git-svn第508行更新

我删除了这个/ dp文件夹有时在我的操作和git似乎处理一切正常，但现在它不会发送到svn。

关于如何解决这个问题的任何建议？

解决方案

有足够的帮助我在一个irc频道。我最终不得不做我的混合本地开发--squash，并设法帮助它。

I've been looking over this post, but still can't figure out how to solve my particular issue.

I'm using git-svn locally against a svn repository. I usually do the following:

1. git svn rebase (to get the latest from the repo).
2. git checkout local-dev
3. git merge master (to merge this into my local branch)
4. make changes, committing locally as I go
5. git checkout master
6. git merge local-dev
7. git svn dcommit (to sent it all back upstream)

Usually works fine, until I tried to commit my latest batch from the merged master back to the repository:

$ git svn dcommit

Committing to http://mysvnrepository ... D PROJECT/Content/js/dp/jquery-1.3.2.js

Merge conflict during commit: Your file or directory 'PROJECT/Content/js/dp' is probably out-of-date: resource out of date; try updating at C:\Program Files\Git/ libexec/git-core/git-svn line 508

I deleted this "/dp" folder sometime in my operations and git appeared to handle everything fine, but now it won't send to to svn.

Any suggestions on how to fix this?

解决方案

Someone was kind enough to help me in an irc channel. I ended up having to do my "git merge local-dev --squash" and that managed to help it out.

这篇关于无法使用git-svn提交删除：您的文件或目录可能已过期的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！