smartgit：执行命令失败：中继线已过时

Question

我该如何解决这个问题？

我使用smartgit/hg作为svn版本库，它一直工作，只有一个主干。现在，我在它开始另一个分支，并用“樱桃-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

推送SmartGit将是提交通过“第一父”路径从refs/heads/trunk可达，直到符合git-svn-id签名的提交。通常这个提交具有“refs/remotes/svn/trunk”引用。

根据屏幕截图（AFAIU）提交可以通过“第一父”路径到达蓝线，但“svn/trunk”引用在粉红线上。这意味着“干线”承诺父母感到困惑。因此，请执行以下操作：

1. 撤销上次合并提交。
2. 确保树干位于粉红线上，否则使用“Reset ...”命令将“trunk”引用移动到svn/trunk。
3. 确保没有外部变化（运行Pull +底座选项）
4. 再次合并“蓝色”分支。
5. 推