New behaviour, not sure from where
Russel Winder
russel.winder at concertant.com
Sat Sep 12 11:02:51 BST 2009
Jelmer,
I have a feature branch of a checkout of a Subversion trunk. The
checkout is a mirror and is up to date. The feature branch is a
descendent of the mirror and has no changes other that one that need to
go into the mirror. I used to be able to push from the feature branch
to the mirror and have that automatically push to Subversion. This is
good. This morning I tried this and:
bzr: ERROR: Operation denied because it would change the mainline history. Set the append_revisions_only setting to False on branch "https://svn.codehaus.org/gant/gant/trunk" to allow the mainline to change.
Which is annoying as it is a bit incomprehensible that this can apply in
this situation -- I am simply appending to the mainline history. Unless
I am misunderstanding something.
The entry from the log is:
Sat 2009-09-12 10:55:55 +0100
0.181 bzr arguments: [u'push']
0.248 looking for plugins in /home/users/russel/.bazaar/plugins
0.995 looking for plugins in /home/users/russel/.bazaar/plugins_Linux_ix86
0.995 looking for plugins in /home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/plugins
1.019 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
1.020 Plugin name launchpad already loaded
1.020 Plugin name netrc_credential_store already loaded
1.020 Plugin name upload already loaded
1.020 Plugin name dbus already loaded
1.021 Plugin name email already loaded
1.021 Plugin name loom already loaded
1.022 Plugin name builddeb already loaded
1.022 Plugin name xmloutput already loaded
1.023 Plugin name bzrtools already loaded
1.074 encoding stdout as sys.stdout encoding 'UTF-8'
1.206 opening working tree '/home/users/russel/Repositories/Bazaar/Masters/Gant/Hooks'
2.183 opening working tree '/home/users/russel/Repositories/Bazaar/Masters/Gant/Trunk'
2.275 failed to import pycurl: No module named pycurl
2.275 failed to instantiate transport <bzrlib.registry._LazyObjectGetter object at a529964, module='bzrlib.transport.http._pycurl' attribute='PyCurlTransport'> for 'https://svn.codehaus.org/gant/gant/trunk': DependencyNotPresent(Unable to import library "pycurl": No module named pycurl)
2.374 bzr-svn: using Subversion 1.5.4 ()
10.120 pushing 'russel.winder at concertant.com-20090830162024-v0zdl3m331xw0xd4' (['russel.winder at concertant.com-20090830152625-dg6dqfw2zjr0wn0u'])
17.282 Traceback (most recent call last):
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/commands.py", line 835, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/commands.py", line 1030, in run_bzr
ret = run(*run_argv)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/commands.py", line 647, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/builtins.py", line 1156, in run
use_existing_dir=use_existing_dir)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/push.py", line 128, in _show_push_branch
remember, create_prefix)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/bzrdir.py", line 1292, in push_branch
tree_to.branch, overwrite, stop_revision=revision_id)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 957, in push
*args, **kwargs)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 3109, in push
_override_hook_source_branch=_override_hook_source_branch)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 2925, in _run_with_write_locked_target
result = callable(*args, **kwargs)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 3133, in _push_with_bound_branches
self.source._basic_push(master_branch, overwrite, stop_revision)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 2323, in _basic_push
overwrite=overwrite, graph=graph)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/decorators.py", line 192, in write_locked
result = unbound(self, *args, **kwargs)
File "/home/Checkouts/Bazaar/Bazaar/Mainline_Mirror/bzrlib/branch.py", line 896, in update_revisions
overwrite, graph)
File "/home/users/russel/.bazaar/plugins/svn/branch.py", line 770, in update_revisions
graph=graph)
File "/home/users/russel/.bazaar/plugins/svn/branch.py", line 838, in _update_revisions
push_merged, overwrite=overwrite)
File "/home/users/russel/.bazaar/plugins/svn/push.py", line 214, in push_branch
overwrite=overwrite)
File "/home/users/russel/.bazaar/plugins/svn/push.py", line 236, in push
override_svn_revprops=target_config.get_override_svn_revprops())
File "/home/users/russel/.bazaar/plugins/svn/push.py", line 150, in push_revision_tree
revid = builder.commit(rev.message)
File "/home/users/russel/.bazaar/plugins/svn/errors.py", line 134, in convert
return unbound(*args, **kwargs)
File "/home/users/russel/.bazaar/plugins/svn/commit.py", line 765, in commit
urlutils.join(self.repository.base, self.branch_path))
AppendRevisionsOnlyViolation: Operation denied because it would change the mainline history. Set the append_revisions_only setting to False on branch "https://svn.codehaus.org/gant/gant/trunk" to allow the mainline to change.
17.283 return code 3
--
Russel.
=============================================================================
Dr Russel Winder Partner
xmpp: russel at russel.org.uk
Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084 voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090912/29eba2da/attachment-0002.pgp
More information about the bazaar
mailing list