当我将主干合并到功能分支中时,主干上发生的删除将不会复制到我的工作副本.
为什么合并时删除主干上的删除不会删除分支上的同一文件？我正在使用subversion 1.5客户端和服务器.
我假设重新集成分支时将跳过对分支中文件的更改？
在主干上兑换文件的最佳方法是什么,因为同事只是因为没有"准备好"而从主干中删除了文件.
情况:
cd project; svn copy trunk branches/f1; svn ci -m "branching out" branches f1;
echo "modifying a file on branch." >> branches/f1/file1; svn ci branches/f1 -m "Branch modified";
echo "Above modify is not even needed to state the case";
svn rm trunk/file1; svn ci trunk -m "creating (conflicting) delete on trunk";
cd branches/f1; svn merge svn+ssh://repos/trunk .
[ -f file1 ] && echo "file f1 does exist while it should have been deleted by merge."; …