smartgit：执行命令失败：trunk已过时

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

On Push SmartGit发送可以通过＆＃34;第一个父亲＆＃34;来自refs / heads / trunk可以访问的提交。路径，直到满足git-svn-id签名的提交。通常这个提交有＆＃34; refs / remotes / svn / trunk＆＃34;参考

根据屏幕截图（AFAIU）提交可以通过＆＃34;第一个父母＆＃34;路径位于蓝线上，但＆＃34; svn / trunk＆＃34;参考是在粉红色的线上。这意味着＆＃34; trunk＆＃34;承诺父母很困惑。以下是

1. 撤消上次合并提交。
2. 确保行李箱位于粉红色的线上，否则移动＆＃34;行李箱＆＃34;使用＆＃34;重置...＆＃34;引用svn / trunk;命令。
3. 确保没有外部更改（运行Pull + rebase选项）
4. 合并＆＃34;蓝色＆＃34;再次分支。
5. 推