我需要从git-svn中取消一些修订 [英] I need to un-fetch some revisions from git-svn

问题描述

我们使用svn，并且使用git-svn来保持理智。有一次，我们的svn服务器决定为某个文件夹返回一个403。这发生在每个人身上，而不仅仅是我。

因此，我无法做一个git-svn rebase。我看到这个错误：

$ p $ 索引不匹配：164adbb93408bed4ff0bdbcbf07bdfb2c49ed0ce！= 64443edc6089f7f737e51cf8ea5ff3680c95a7e9
重读0f2fa25d15a35ac3fe311e3e0142f1d9e5a3be18
M测试/系统-test / src / test / java / com / garmin / elevation / ElevationManagerSystemTest.java
M test /activity-test/src/test/java/com/garmin/mb/activity/service/ActivityServiceManagerIntegrationTest.java
M系统/ deployment / src / main / resources / oracle / releases / 2.9-SNAPSHOT / 110-preference /4-data.dml.sql
M pom.xml
service / activity-service-1.2 / src / main / java / com / garmin / activity / service / impl / ActivityServiceImpl.java找不到在提交0f2fa25d15a35ac3fe311e3e0142f1d9e5a3be18（r8845）


最后抱怨的文件位于文件夹中当我们发生错误时返回403。在我的文件系统上，service / activity-service文件夹不存在。我相信它正在尝试修改文件（这就是svn中的改变），但由于文件不存在，所以只会爆炸。

所以我想想如果我能够删除以前的版本，然后重新获取它们，它可能会正常工作。我只是不知道该怎么做。我尝试了交互式重新绑定，然后删除了一堆，但那没有奏效。

所以，任何人都知道如何取得已取得的版本？

解决方案

现在更好的方法是 git svn reset -r 其中 rev 是之前的版本 / strong>你想开始重新吸引。完成之后，运行 git svn fetch ，它会重建索引并在 rev 之后重新获取修订版。

We use svn, and I use git-svn to maintain sanity. At one point, our svn server decided to return a 403 for a certain folder. It happened to everybody, not just me.

Because of this, I'm unable to do a git-svn rebase. I see this error:

Index mismatch: 164adbb93408bed4ff0bdbcbf07bdfb2c49ed0ce != 64443edc6089f7f737e51cf8ea5ff3680c95a7e9
rereading 0f2fa25d15a35ac3fe311e3e0142f1d9e5a3be18
    M   test/system-tests/src/test/java/com/garmin/elevation/ElevationManagerSystemTest.java
    M   test/activity-test/src/test/java/com/garmin/elevation/ElevationManagerIntegrationTest.java
    M   test/activity-test/src/test/java/com/garmin/mb/activity/service/ActivityServiceManagerIntegrationTest.java
    M   system/deployment/src/main/resources/oracle/releases/2.9-SNAPSHOT/110-preference/4-data.dml.sql
    M   pom.xml
service/activity-service-1.2/src/main/java/com/garmin/activity/service/impl/ActivityServiceImpl.java was not found in commit 0f2fa25d15a35ac3fe311e3e0142f1d9e5a3be18 (r8845)

The file that it's complaining about at the end is in the folder that was returning a 403 when we had the error. On my file system, the service/activity-service folder doesn't exist. I believe it's trying to modify the file (that's what the change in svn looks like), but since the file doesn't exist, it just blows up.

So I think if I'm able to remove past revisions, and then re-fetch them, it might just work. I'm just not sure how to do that. I tried rebasing interactively and then deleting a bunch, but that didn't work.

So, anyone know how to un-fetch already fetched versions?

解决方案

A better way to do this now is git svn reset -r <rev> where rev is the revision before where you want to start refetching. After that's done, just run git svn fetch and it will rebuild its index and refetch the revisions after rev.

这篇关于我需要从git-svn中取消一些修订的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！