1

When using SVN 1.6 good old svn merge --dry-run --revision BASE:HEAD . would tell me.

Now with SVN 1.7 this merge won't work because the the WC is mixed revision (i.e. SVN update has not been run after commiting).

I want to know if any conflicts will occur before running the SVN update.

It seems a bit chicked and egg now.

Any ideas please?!

4

1 回答 1

0

试试这个--allow-mixed-revisions标志，像这样：

svn merge --dry-run --revision BASE:HEAD . --allow-mixed-revisions

这适用于我，使用 Subversion 1.8.3。

于 2013-09-22T12:16:46.980 回答