smartgit:执行命令失败：主干已过时

我怎样才能解决这个问题

我将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

---

推送时，SmartGit发送可通过“第一父级”路径从REF/heads/trunk访问的提交，直到满足git svn id签名的提交。通常，此提交具有“refs/remotes/svn/trunk”引用

根据屏幕截图（AFAIU），可通过“第一父级”访问的提交路径位于蓝线上，但“svn/trunk”引用位于粉红线上。这意味着“主干”提交的父母感到困惑。下面的步骤也是如此

撤消上次合并提交

确保主干位于粉红色线上，否则使用“重置…”命令将“主干”引用移动到svn/trunk

确保没有外部更改（运行Pull+重设基础选项）

再次合并“蓝色”分支

推

---

我通过撤消蓝线上的所有6个提交来解决了这个问题，因为它们都是从绿线中挑选的更改。然后我只有两行代码，就像以前一样，我可以将本地git-“trunk”引用重置为“svn/trunk”。