I have a bzr branch and what to push it to a subversion location, which already has some code.
The branches are reported by bazaar to diverge.
The following command makes bazaar to crash :
bzr push --overwrite svn+https://REMOTE_LOCATION
bzr: failed to report crash using apport:
OSError(13, 'Permission denied')
bzr: ERROR: subvertpy.SubversionException: ("File or directory '.' is out of date; try updating", 160024)
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 1161, in run
use_existing_dir=use_existing_dir)
File "/usr/lib/python2.6/dist-packages/bzrlib/push.py", line 139, in _show_push_branch
remember, create_prefix)
File "/home/cerf/.bazaar/plugins/svn/remote.py", line 289, in push_branch
overwrite=overwrite)
File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 1077, in push
*args, **kwargs)
File "/home/cerf/.bazaar/plugins/svn/branch.py", line 1016, in push
override_svn_revprops=_override_svn_revprops)
File "/home/cerf/.bazaar/plugins/svn/branch.py", line 926, in _update_revisions
push_merged, overwrite=overwrite)
File "/home/cerf/.bazaar/plugins/svn/push.py", line 217, in push_branch
overwrite=overwrite)
File "/home/cerf/.bazaar/plugins/svn/push.py", line 239, in push
override_svn_revprops=target_config.get_override_svn_revprops())
File "/home/cerf/.bazaar/plugins/svn/push.py", line 153, in push_revision_tree
revid = builder.commit(rev.message)
File "/home/cerf/.bazaar/plugins/svn/errors.py", line 146, in convert
raise convert_error(e)
SubversionException: ("File or directory '.' is out of date; try updating", 160024)
bzr 2.2.1 on python 2.6.6 (Linux-2.6.35-24-generic-pae-i686-with-Ubuntu-10.10-maverick)
arguments: ['/usr/bin/bzr', 'push', '--overwrite', 'https://proxy71.sescoi.net/svn/dental_automation/trunk']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bash_completion /usr/lib/python2.6/dist-packages/bzrlib/plugins/bash_completion [2.2.1]
bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.2.0]
launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.2.1]
netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [2.2.1]
news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.2.1]
qbzr /usr/lib/python2.6/dist-packages/bzrlib/plugins/qbzr [0.19.1]
svn /home/cerf/.bazaar/plugins/svn [1.0.4]
*** Bazaar has encountered an internal error. This probably indicates a
bug in Bazaar. You can help us fix it by filing a bug report at
https://bugs.launchpad.net/bzr/+filebug
including this traceback and a description of the problem.
Note also that doing a bzr merge inside my bzr branch I get this error :
bzr: ERROR: An inconsistent delta was supplied involving '<unknown>', None
reason: Parent is not present in resulting inventory.
I am having a similar problem. I am trying to push bzr revisions from a branch of an svn "trunk" branch. It has been a while since I last pushed, and there have been revisions in the svn trunk, which I have merged successfully into my bzr branch. When I try to push, whether using --overwrite or not, I get the stacktrace below.
Note that I have append_ revisions_ only set to False in my ~/.bazaar/ subverson. conf file.
The guessed layout shown in subversion.conf is trunk0.
If I try bzr up, it says the tree is up to date. And bzr merge says there is nothing to do.
Here is the output of bzr info and bzr push.
$ bzr info
Standalone tree (format: 2a)
Location:
branch root: .
Related branches: smartrack/ svn/AVS/ trunk smartrack/ svn/AVS/ trunk
push branch: svn+http://
parent branch: svn+http://
$ bzr push smartrack/ svn/AVS/ trunk smartrack: 80> Quad Source Code Repository pnoffke password: SubversionExcep tion: ("File or directory '.' is out of date; try updating", 160024)
Using saved push location: svn+http://
HTTP smartrack username: pnoffke
<http://
bzr: ERROR: subvertpy.
Traceback (most recent call last): python2. 7/site- packages/ bzrlib/ commands. py", line 912, in exception_ to_return_ code python2. 7/site- packages/ bzrlib/ commands. py", line 1112, in run_bzr python2. 7/site- packages/ bzrlib/ commands. py", line 690, in run_argv_aliases **all_cmd_ args) python2. 7/site- packages/ bzrlib/ commands. py", line 705, in run .run_simple( *args, **kwargs) python2. 7/site- packages/ bzrlib/ cleanup. py", line 135, in run_simple python2. 7/site- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups python2. 7/site- packages/ bzrlib/ builtins. py", line 1161, in run existing_ dir=use_ existing_ dir) python2. 7/site- packages/ bzrlib/ push.py" , line 139, in _show_push_branch pnoffke/ .bazaar/ plugins/ svn/remote. py", line 289, in push_branch overwrite) python2. 7/site- packages/ bzrlib/ branch. py", line 1077, in push pnoffke/ .bazaar/ plugins/ svn/branch. py", line 1016, in push svn_revprops= _override_ svn_revprops) pnoffke/ .bazaar/ plugins/ svn/branch. py", line 926, in _update_revisions overwrite) pnoffke/ .bazaar/ plugins/ svn/push. py", line 217, in push_branch overwrite) pnoffke/ .bazaar/ plugins/ svn/push. py", line 239, in push svn_revprops= target_ config. get_override_ svn_revprops( ))
File "/usr/lib64/
return the_callable(*args, **kwargs)
File "/usr/lib64/
ret = run(*run_argv)
File "/usr/lib64/
return self.run(
File "/usr/lib64/
return self._operation
File "/usr/lib64/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib64/
result = func(*args, **kwargs)
File "/usr/lib64/
use_
File "/usr/lib64/
remember, create_prefix)
File "/home/
overwrite=
File "/usr/lib64/
*args, **kwargs)
File "/home/
override_
File "/home/
push_merged, overwrite=
File "/home/
overwrite=
File "/home/
override_
File "/home/pnoffke...