"Svndiff contains a too-large window" error

[Sjors Gielen]

Just tried to push a commit to an SVN repository that isn't that big. There are two hunks of about twenty to thirty lines, the rest is tiny. The commit was the result of a merge from another BZR repository, where I had to merge the diffs for three files myself because the files had moved in the SVN repository. This is what happened:

in BZR: edited ChangeLog, kmess.cpp, kmesssession.cpp, kmesssession.h
in SVN: edited ChangeLog, kmess.cpp moved to mainwindow.cpp, kmesssession.cpp moved to network/msnsession.cpp, kmesssession.h moved to network/msnsession.h

Maybe the actual svndiff contains the removal of some files, causing the diff to become very large. Anyway, after the merge, I tried to commit, got this message + backtrace:

$ bzr commit
Committing to: https://kmess.svn.sourceforge.net/svnroot/kmess/trunk/kmess
modified ChangeLog
modified src/mainwindow.cpp
modified src/network/msnsession.cpp
modified src/network/msnsession.h
bzr: ERROR: subvertpy.SubversionException: ('Svndiff contains a too-large window', 185001)

Traceback (most recent call last):
  File "/sw/lib/python2.6/site-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/sw/lib/python2.6/site-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/sw/lib/python2.6/site-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/sw/lib/python2.6/site-packages/bzrlib/builtins.py", line 2932, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/sw/lib/python2.6/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/sw/lib/python2.6/site-packages/bzrlib/workingtree_4.py", line 226, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/sw/lib/python2.6/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/sw/lib/python2.6/site-packages/bzrlib/mutabletree.py", line 228, in commit
    *args, **kwargs)
  File "/sw/lib/python2.6/site-packages/bzrlib/commit.py", line 397, in commit
    self.branch.repository, new_revno, self.rev_id)
  File "/sw/lib/python2.6/site-packages/bzrlib/plugins/svn/branch.py", line 491, in import_last_revision_info
    self.get_push_merged_revisions(), overwrite=False)
  File "/sw/lib/python2.6/site-packages/bzrlib/plugins/svn/push.py", line 220, in push_branch
    overwrite=overwrite)
  File "/sw/lib/python2.6/site-packages/bzrlib/plugins/svn/push.py", line 242, in push
    override_svn_revprops=target_config.get_override_svn_revprops())
  File "/sw/lib/python2.6/site-packages/bzrlib/plugins/svn/push.py", line 156, in push_revision_tree
    revid = builder.commit(rev.message)
  File "/sw/lib/python2.6/site-packages/bzrlib/plugins/svn/errors.py", line 131, in convert
    raise convert_error(e)
SubversionException: ('Svndiff contains a too-large window', 185001)

bzr 1.15 on python 2.6.2 (darwin)
arguments: ['/sw/bin/bzr', 'commit']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'nl_NL.UTF-8'
plugins:
  launchpad /sw/lib/python2.6/site-packages/bzrlib/plugins/launchpad [1.15]
  netrc_credential_store /sw/lib/python2.6/site-packages/bzrlib/plugins/netrc_credential_store [1.15]
  svn /sw/lib/python2.6/site-packages/bzrlib/plugins/svn [0.6.3]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.