开发者

One Large SVN Merge vs Several Small Merges - Timesout!

I'm currently merging my trunk into a different branch. There have been close to 3000 commits in between. The SVN repo resides on a remote server and when I do the merge on the full set of revisions SVN fails saying the connection to the SVN server timed out. Thinking there was just too much merge action, I tried to do smaller merges, between the first 200 commits, which didn't timeout -- so then I proceeded to keep merging in increments of 200.

Is this going to cause problems? (not merging a full set of revisions?)

Is there a way to keep SVN from timing out when merging a huge set of changes?

UPDAT开发者_如何学PythonE: Error Message

svn: REPORT of '/repos/somerepo/with/code': timed out waiting for server (http://my.svn.server.com)


Sounds like a client side timeout. Depends on your client but take a look at your [home directory]/.subversion/servers file for a field named http-timeout in the [global] section.

GUI tools usually have an option for this and sometimes mis-label it as a proxy related setting even though all timeouts are global (e.g. IntelliJ)

0

上一篇:

下一篇:

精彩评论

暂无评论...
验证码 换一张
取 消

最新问答

问答排行榜