2

我怎么解决这个问题？

我将 smartgit/hg 用于 svn 存储库，它总是可以工作，只有一个主干。现在，我在其中启动了另一个分支，并使用了“Cherry-pic”，我遇到了这个问题：

Executing a command has failed.
svn: Verzeichnis "/trunk" ist veraltet

这意味着：“文件夹/主干已过时”等

我该如何解决这个问题？

那个消息每次都会再次出现

这是我的树： 在此处输入图像描述

它的底部屏幕，日志如下所示：

Synchronize: svn: Verzeichnis »/trunk« ist veraltet
HEAD is now at 347425d Merge remote-tracking branch 'refs/remotes/svn/trunk' into trunk
HEAD is now at 347425d Merge remote-tracking branch 'refs/remotes/svn/trunk' into trunk
Automatic merge went well; stopped before committing as requested
Already up-to-date!
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
Already up-to-date!
Squash commit -- not updating HEAD
Trying simple merge with d800a237bf659f59bfa63781afcede0a8a31e148
Trying simple merge with cecb0300061476beaf44b82ef3aebceb753ecb0a
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
Already up-to-date!
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
Already up-to-date!
Squash commit -- not updating HEAD
Trying simple merge with 7c2851542517e5071a08c8170b8921bf1e02681e
Trying simple merge with e7da29419e447230a3fa434fadaf948e15c2c796
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
HEAD is now at 347425d Merge remote-tracking branch 'refs/remotes/svn/trunk' into trunk
4

1 回答 1

2

在 Push SmartGit 发送可通过“第一父”路径从 refs/heads/trunk 访问的提交，直到满足带有 git-svn-id 签名的提交。通常这个提交有“refs/remotes/svn/trunk”参考。

根据屏幕截图（AFAIU），“第一父”路径可访问的提交位于蓝线上，但“svn/trunk”引用位于粉红色线上。这意味着“主干”提交父母感到困惑。所以请执行以下操作

  1. 撤消最后一次合并提交。
  2. 确保主干位于粉红色线上，否则使用“重置...”命令将“主干”引用移动到 svn/主干。
  3. 确保没有外部更改（运行 Pull+rebase 选项）
  4. 再次合并“蓝色”分支。
  5. 推
于 2013-05-27T16:01:25.367 回答