git - smartgit : executing a command has failed: trunk is outdated

Question

我怎么解决这个问题？

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

Answer 1

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

根据屏幕快照(AFAIU)，“第一父级”路径可到达的提交位于蓝线上，而“svn/trunk”引用位于粉红色线上。这意味着“干线”犯 parent 感到困惑。所以做以下

撤消上一次合并提交。

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

确保没有外部更改(运行Pull + rebase选项)

再次合并“蓝色”分支。

推送